tree 7da90026b627a663299758d8613056f103eb9fe4
parent 1dbbc2045ae16a4923b30c9576703d02a4363529
parent 2f4ad45d60aac5b2b025e9eac34e289d406645dc
author Jon Larimer <jlarimer@google.com> 1422554110 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422554110 +0000

am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev

* commit '2f4ad45d60aac5b2b025e9eac34e289d406645dc':
  DO NOT MERGE Restore calling identity before checking permission