tree 8a2ad642b3eb79903546ed32f689a47927a9a405
parent b628861f8a3fd7973e6aae201ed43483ef4a4636
parent 27a0b636ac60a504287eb48bfa2e9ec103633c2a
author Adam Powell <adamp@google.com> 1286232517 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286232517 -0700

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