Merge "Work around scroller bugs" into lmp-dev
tree: ada75ce4cf170811474a81bebd842882b7b380ae
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags