am a1fb3950: Merge change 5394 into donut

Merge commit 'a1fb3950cf46f61800d2ca41d2020037d6b2307e'

* commit 'a1fb3950cf46f61800d2ca41d2020037d6b2307e':
  Fixes #1940605. RelativeLayout was swapping horizontal and vertical

1 files changed, 2 insertions, 2 deletions

diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java
index 44cf9a41c40c..00bc21e3784e 100644
--- a/core/java/android/widget/RelativeLayout.java
+++ b/core/java/android/widget/RelativeLayout.java
@@ -343,7 +343,7 @@ public class RelativeLayout extends ViewGroup {
             ignore = findViewById(mIgnoreGravity);
         }
 
-        View[] views = mSortedVerticalChildren;
+        View[] views = mSortedHorizontalChildren;
         int count = views.length;
         for (int i = 0; i < count; i++) {
             View child = views[i];
@@ -356,7 +356,7 @@ public class RelativeLayout extends ViewGroup {
             }
         }
 
-        views = mSortedHorizontalChildren;
+        views = mSortedVerticalChildren;
         count = views.length;
         for (int i = 0; i < count; i++) {
             View child = views[i];