| commit | 8fe58ec47ecdb02398c244aede6110691806c8f9 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 18:14:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 18:14:44 2015 +0000 |
| tree | e60b700e8d8ccd177392af36d73ab65ce32fbeb8 | |
| parent | 7e741f24f21c0690131b4935738be506f83d876c [diff] | |
| parent | 02cc4ac98e7b46c9cfd8c5e5213ed29bb8968b06 [diff] |
am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev * commit '336fc1fff793b2e5272f0b37cefe9ccf5dba5a53': DO NOT MERGE Restore calling identity before checking permission