Snap for 4448085 from 4b8c905396079013a66f7e31de7867062444e6cc to oc-m3-release

Change-Id: I46f49661ac6200680f25c57023ca2ffc8154a3eb
tree: 94bd51719de78eb722e81ad6c526d5080d7a7e44
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml