am c709f36f: am 5f93d16f: am d49178cf: merge in KFS78N (no-op)

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