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