| commit | 02cc4ac98e7b46c9cfd8c5e5213ed29bb8968b06 | [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 | 809798e1d3fdcf1bf7e4962c45a73c111e694557 | |
| parent | 738d8a56cceb3f8d2f6ced4c043b014b1eb48f07 [diff] | |
| parent | 2cf6d52a3b5c4398667cd00361bff4440f6df82d [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