Merge pi-dr1-dev to aosp-master
am: 3868a16e4f

Change-Id: If0886de3618c994e88ea5d8023cba76abe8d1757
tree: 527da8c5f3b8a8ef9685e3323453a087139f1767
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags