tree 1cc68b7b88bf99109e94b0df02ca0490b05c0c00
parent 782fd14764ff9e579d4473be204843c48895c07c
parent 24e4d48f56a6fca6974c5670b88a7b4da2180331
author Todd Kennedy <toddke@google.com> 1439400890 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439400890 +0000

am 24e4d48f: Merge "Promote system app permissions" into mnc-dev

* commit '24e4d48f56a6fca6974c5670b88a7b4da2180331':
  Promote system app permissions