Merge pi-dr1-dev to aosp-master am: dd047f4a8b
am: 12b5602287

Change-Id: I3134cf8b4ed743234ada735db3d0350a5421037e
tree: 276700c41e6024497f1edb881fa936f39860b5e4
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml