| commit | 6959a94f372d54e63f53b8cfc98b57ce4ab0866b | [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 | a8d9063287cd4daebbcd94f89db40f62a4164b0d | |
| parent | 3f9d57dbe896d56e0eae381aa3e70ac93d755f24 [diff] | |
| parent | 336fc1fff793b2e5272f0b37cefe9ccf5dba5a53 [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