Merge "Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned" into ics-mr0
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 41daf70..041e8a4 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -2476,6 +2476,7 @@
 
         if (gravity != mGravity) {
             invalidate();
+            mLayoutAlignment = null;
         }
 
         mGravity = gravity;