tree 449deb75bf28335df94db6677e6d2506c3d666cc
parent c46701bc78de081d9d8bdd294758ed6242892ddb
parent d28951e41c01652740e01f586e96463de934a831
author Yorke Lee <yorkelee@google.com> 1437843236 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437843236 +0000

am d28951e4: am ad00b313: am ffeb2959: am 036cb573: am 3f468007: Merge "Protect against lack of WRITE_SYSTEM_SETTINGS AppOp" into mnc-dev

* commit 'd28951e41c01652740e01f586e96463de934a831':
  Protect against lack of WRITE_SYSTEM_SETTINGS AppOp