Merge commit 'cafb87ea51d9683c46c58833e1a6433a2c184bbb' into HEAD

Change-Id: I015188f2b814435b1f8e64127693473f7dcef19a
tree: c2b8a460186040074a435a2fd1c0b5578163b265
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml