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