merge in klp-release (no-op)
tree: ba2bfc2ccbe4b26150a236930d42cdff2c7748cc
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml