Snap for 4665332 from b868d019b59668bcffabdd72d9945d54a0c1afd6 to pi-release

Change-Id: I46a7eb22590851e90a25d6710a3e52029b28b439
tree: 49f291f1d99604a7eb5121dd0fdb93532e24aec1
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml