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