Snap for 4728508 from 2c6aa580fd0cb7d94890d42318e83aa825336c4f to pi-release

Change-Id: I03704fbf2845a6c47cf26708329891a30b8f87f6
tree: 4a16edb99aae85306e055ff722ddb297c5f80b6c
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. PREUPLOAD.cfg