| commit | 470f3a98be8ecff3beca275c20b085da928e8943 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 18:50:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 18:50:21 2015 +0000 |
| tree | a8d9063287cd4daebbcd94f89db40f62a4164b0d | |
| parent | 9a2793e0ba11336b57457cde0d6dbc3628e853ed [diff] | |
| parent | 0a63d8176d8c3099c2e40bdbb00220f5aeeff69e [diff] |
am 0a63d817: am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev * commit '0a63d8176d8c3099c2e40bdbb00220f5aeeff69e': DO NOT MERGE Restore calling identity before checking permission