am 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev
am 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev

* commit '42cc892be135ed5be6f98f5f70bb6739bfaecaad':
  Account for margins in ScrollView onMeasure() when filling viewport

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