am 7c35a8e9: Merge "Fix crasher due to IndexOutOfBoundsException" into lmp-mr1-dev

* commit '7c35a8e9d185b044b4913b548a6245d46a589be3':
  Fix crasher due to IndexOutOfBoundsException
tree: cf9fb3fba6229dac844bb4940e914ced0e5a38d0
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags