tree 06b651e40f476f422d9ccb9ad8e8cf7021f23a48
parent 5c0ae417780eea9e2c235a1800d0823cb4a967e5
parent 78c984aef222654bd337ae7f466a526e23db8f07
author Jeff Sharkey <jsharkey@android.com> 1377897224 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377897224 -0700

am 78c984ae: am 5835ac9e: Merge "Only check caller when deriving permissions." into klp-dev

* commit '78c984aef222654bd337ae7f466a526e23db8f07':
  Only check caller when deriving permissions.