| commit | 95b85c1539c1569371ba0576da635e3e2557a433 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 18:40:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 18:40:14 2015 +0000 |
| tree | 006ae6ee2e87de03bf7a2145fa94add644bca76d | |
| parent | f9c9652256921eeb70484757f375aaa252f9c574 [diff] | |
| parent | 9a2793e0ba11336b57457cde0d6dbc3628e853ed [diff] |
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':