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

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