From 3e79838a31b5adf0b773b2c5171e93a7a19194e1 Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philikon@fb.com>
Date: Fri, 31 Jul 2015 22:03:05 -0700
Subject: [PATCH] [React Native] sync JS for D2287297

---
 Libraries/Components/ScrollView/ScrollView.js      | 3 ++-
 Libraries/Components/View/View.js                  | 1 +
 Libraries/ReactNative/ReactNativeViewAttributes.js | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index e82c5134b..765934bfc 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -333,7 +333,8 @@ var ScrollView = React.createClass({
       <View
         ref={INNERVIEW}
         style={contentContainerStyle}
-        removeClippedSubviews={this.props.removeClippedSubviews}>
+        removeClippedSubviews={this.props.removeClippedSubviews}
+        collapsable={false}>
         {this.props.children}
       </View>;
 
diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
index a016a9967..5ba250dea 100644
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -227,6 +227,7 @@ var View = React.createClass({
      * interaction/animation.
      */
     renderToHardwareTextureAndroid: PropTypes.bool,
+    collapsable: PropTypes.bool,
   },
 
   render: function() {
diff --git a/Libraries/ReactNative/ReactNativeViewAttributes.js b/Libraries/ReactNative/ReactNativeViewAttributes.js
index e7db511ef..c9d715433 100644
--- a/Libraries/ReactNative/ReactNativeViewAttributes.js
+++ b/Libraries/ReactNative/ReactNativeViewAttributes.js
@@ -26,6 +26,7 @@ ReactNativeViewAttributes.UIView = {
   onLayout: true,
   onAccessibilityTap: true,
   onMagicTap: true,
+  collapsable: true,
 };
 
 ReactNativeViewAttributes.RCTView = merge(