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