tree 82b5f2b173419334be5bfd81401f159593bae78f
parent 6e45d79ee45d79c063e71c3292d652fc0e258415
parent e7889d237cbcf59d7b50aa1511e06a4de04b351e
author The Android Open Source Project <initial-contribution@android.com> 1347461639 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347461639 -0700

am e7889d23: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'e7889d237cbcf59d7b50aa1511e06a4de04b351e':
  Use focal point for scrolling.
  Use a local copy of HorizontalScrolllView.