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

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