Merge "Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned" into ics-mr0

core/java/android/widget/TextView.java

@@ -2476,6 +2476,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
 
         if (gravity != mGravity) {
             invalidate();
+            mLayoutAlignment = null;
         }
 
         mGravity = gravity;