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