am 072533e9: Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev
am 072533e9: Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev

* commit '072533e934e759b95228ba61152e7d958b641b96':
  Fix bug #7146516 Padding can be "over" resolved

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