Merge pi-dr1-dev to aosp-master am: f4995c70b4
am: ba5394e9aa

Change-Id: I0979ba2db8122240c7330d6f33ac5311c05f9692
tree: 2c3c8270dab90b52f181e131956890f39c9299f8
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml