Merge "Remove android.permission.WRITE_SECURE_SETTINGS from AndroidManifest.xml" am: 506232d1d4 am: 2328ff877e
am: ee1d3fd5f7

Change-Id: Ida9ed2e1e7ae68f2e1c8bd443fec43e8b7d4f00b
tree: 7942aa33d298324ae519b207a826889fb799781b
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml