am b8d3bc5c: (-s ours) am 103f59ba: Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread

Merge commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669'

* commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669':
  Fix bug 3052686 - ScrollView padding treated incorrectly
tree: c7f57a471ef7a293ba101955c412b9d2376d3908
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE