tree 006ae6ee2e87de03bf7a2145fa94add644bca76d
parent f9c9652256921eeb70484757f375aaa252f9c574
parent 9a2793e0ba11336b57457cde0d6dbc3628e853ed
author Jon Larimer <jlarimer@google.com> 1422556814 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422556814 +0000

am 9a2793e0: am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6  -s ours automerge: f8571c8a  -s ours

* commit '9a2793e0ba11336b57457cde0d6dbc3628e853ed':