am 7c669f45: Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev
am 7c669f45: Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev

* commit '7c669f4547d459d64ac403647e177b9953dfe60a':
  Revert "Work around inconsistent views in RelativeLayout.onMeasure()"

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