tree 8a5ad4f8dc7a9fe66fd13b7964c35966d5d5d984
parent 8505d4a51d1112ea71f7df680cf85378a9567bde
parent 7f70ba18e6760c2539704c16cf3865bf49953d50
author Billy Lau <billylau@google.com> 1436898149 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436898150 +0000

Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev