am ae2a407e: am e183a9ee: Merge "Fix build break." into klp-dev

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