am 103f59ba: Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread

Merge commit '103f59baa7f7d03cfe22a4b07690cc809185dfe9' into gingerbread-plus-aosp

* commit '103f59baa7f7d03cfe22a4b07690cc809185dfe9':
  Fix bug 3052686 - ScrollView padding treated incorrectly