Snap for 4557233 from fdaec367bf5f951d4d2fc255f4cacd0a5258479c to pi-release

Change-Id: I9235922f7245c4f80513a4dc4321e64b3806f94d
tree: 20de4bfa13b06ca9049b547d6a7e1ade9729e011
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml