am 66b5a6fc: am f717b620: am f65b3dfb: merge in klp-release (no-op)

* commit '66b5a6fca7042c991536feacaadbc7ded60b1917':
tree: d23b58e299850357c39d34f2325202c60f36701d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags