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