DO NOT MERGE

Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: I5c80742edfd28903c04ab4da59b75706f90c629d
tree: ba302ad1951f108fa13fb7be9a765beda75b3f4d
  1. src/
  2. Android.mk
  3. AndroidManifest.xml
  4. proguard.flags