merge in klp-release history after reset to klp-dev
tree: 810e54666c423053d0bbf4632790af78fb156a2d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags