am 77b2a861: Merge "Fix padding resolution" into klp-dev
am 77b2a861: Merge "Fix padding resolution" into klp-dev

* commit '77b2a86144365ce3dee557b5c444075c0e0a4033':
  Fix padding resolution

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