tree 37c86a1c29000e8f171ec23b6a65a2f65ee825c8
parent 51fed06f0ca2d7b3adf9a836337be31f5812f0b3
parent b14dc048ec8323e4a10bbfe42129bb91616470b8
author Dianne Hackborn <hackbod@google.com> 1436317685 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436317685 +0000

am b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev

* commit 'b14dc048ec8323e4a10bbfe42129bb91616470b8':
  Add new "preinstalled" permission flag.