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

Change-Id: I6e7a12df54964cf91aa06528f70a606cf10a7eda
tree: 8758c74b0f5bcf68f7ff5493ea57d7a8f5562e40
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml