am 835ac921: am 988a4329: am 050e2a8d: Merge "Fix IOOB exception in ViewDragHelper" into lmp-mr1-dev

* commit '835ac9216232a00cca5040a554e0f7075159554c':
  Fix IOOB exception in ViewDragHelper
tree: 97b8753b5575d981c7172f7b62bfc688c195fa33
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags