tree 7da41e730feea3fd3b2803c01ab321f2170ba189
parent 7a7d3a0ee018e9309151b141ce472a47514877a2
parent 95b85c1539c1569371ba0576da635e3e2557a433
author Jon Larimer <jlarimer@google.com> 1422557274 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422557274 +0000

am 95b85c15: 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 '95b85c1539c1569371ba0576da635e3e2557a433':