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

Change-Id: Ie3586d8f32fc7b4b05051538199b0e716c9e787c
tree: 91af25088f343404862708ff385ea3df39acca84
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml