tree 8ac9ab9e0e81d50cc2983f39f5fdbf362cd9fd4e
parent f3feddc3b9b7105b34b52ae89d69127ea2ebaac0
parent 036cb5730555161e16900129d62d06b308fb4298
author Yorke Lee <yorkelee@google.com> 1437839676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437839676 +0000

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

* commit '036cb5730555161e16900129d62d06b308fb4298':
  Protect against lack of WRITE_SYSTEM_SETTINGS AppOp