tree 6c479c7f59659020f111a00f80dbf1afbab5a9bd
parent 1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c
parent 64d6bacf13e4ae913c52b773439a542dc5b2b714
author Jon Larimer <jlarimer@google.com> 1422554547 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422554547 +0000

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

* commit '64d6bacf13e4ae913c52b773439a542dc5b2b714':
  DO NOT MERGE Restore calling identity before checking permission