am 9a766450: (-s ours) am 43bd98e5: (-s ours) am 4889048e: am c5517b3e: Protect against class cast exception DO NOT MERGE

* commit '9a7664506828bc0e3f5be74f6bd043f629a19c91':
tree: af39ceb9c6cb26c3ee1ea02c1e03de9a2486ac93
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags