am 41148af5: Merge "Fix bug #7241988 Padding is mostly set to "0"" into jb-mr1-dev
am 41148af5: Merge "Fix bug #7241988 Padding is mostly set to "0"" into jb-mr1-dev

* commit '41148af5e6f1699c4e87ff6aa0ac1be974587aff':
  Fix bug #7241988 Padding is mostly set to "0"

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