am d49178cf: merge in KFS78N (no-op)

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