tree adeb2a01c14bf84bb79d36575063074a9c8da063
parent a9fc8aa3c88e7b837be65abf6f3b0f3e2e9a4a1e
parent 96d00ab359d60197321f06b4feb3d01f3fa03a29
author Billy Lau <billylau@google.com> 1436828454 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436828454 +0000

am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev

* commit '96d00ab359d60197321f06b4feb3d01f3fa03a29':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission