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