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

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