tree b3f32891348a792966cd503ad8fd834ec5a17b77
parent cf00a86461bb39ca5cb6461cab280aeb4d42bab3
parent f028ba3db3d3b6478154952dbbd8ed7422ad14f6
author Billy Lau <billylau@google.com> 1436830514 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436830514 +0000

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

* commit 'f028ba3db3d3b6478154952dbbd8ed7422ad14f6':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission