Merge "Protect against class cast exception" into klp-dev
tree: e1349bdae24a3fbe6cf87e140d5495e35e2d56fa
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags