tree 3e6ed46d2e4b17a1c6a85f54d37394351f92ab27
parent 4fb81253edc726936d4b71b7e9c0789cab45e9da
parent 22b3f4cb15207239e203d5ec8b72ec6bc90fef35
author Billy Lau <billylau@google.com> 1436738554 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436738557 +0000

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