| commit | 143ac135dcf85b899ae387be2f13401ecd43f08b | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 18:40:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 18:40:15 2015 +0000 |
| tree | a0c3ff70b6a365bc911f442c8d867a80892a7ac2 | |
| parent | bb150725ca5b0998c06c5e34b774a78e8d74b0f5 [diff] | |
| parent | 7a7d3a0ee018e9309151b141ce472a47514877a2 [diff] |
am 7a7d3a0e: am f9c96522: am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev * commit '7a7d3a0ee018e9309151b141ce472a47514877a2': DO NOT MERGE Restore calling identity before checking permission