am 5575e97c: Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev
am 5575e97c: Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev

* commit '5575e97cea2bbaf0f4f1c3445e28cff2759d4f74':
  Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base