tree f27d1abd8bb6e57306bcc632ae09606a9cbc166d
parent 0cc59815c39b7579173234af82468317322bec0b
parent 3f468007170d180663af54d2380046f0c2f04543
author Yorke Lee <yorkelee@google.com> 1437786696 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437786696 +0000

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

* commit '3f468007170d180663af54d2380046f0c2f04543':
  Protect against lack of WRITE_SYSTEM_SETTINGS AppOp