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

* commit '988a4329a558ecd45c99da16fdbf02b2690e835d':
  Fix IOOB exception in ViewDragHelper
tree: 200b0e5013da38e06d5bacb92858cd5eb4c78617
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags