Snap for 4722539 from 89fe277a87900eeec38e16984d3b5234c2e301f1 to pi-release

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