am 4a89348e: am a7d8c348: Merge "Fix build break." into klp-dev

* commit '4a89348ee1c5e7c9fcf52709b8ef153b6dbc17e2':
  Fix build break.
tree: 32f3e2b8a8985b62b4953d19dadde49db3b43c9e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags