| commit | 51ea897fca66c4042563a89f4593b9fd41f01b9d | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 18:57:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 18:57:17 2015 +0000 |
| tree | 006ae6ee2e87de03bf7a2145fa94add644bca76d | |
| parent | 95b85c1539c1569371ba0576da635e3e2557a433 [diff] | |
| parent | 470f3a98be8ecff3beca275c20b085da928e8943 [diff] |
am 470f3a98: 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 '470f3a98be8ecff3beca275c20b085da928e8943': DO NOT MERGE Restore calling identity before checking permission