| commit | 0a63d8176d8c3099c2e40bdbb00220f5aeeff69e | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 18:43:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 18:43:43 2015 +0000 |
| tree | b14af1eeebaff0c79f47d8d8089f1e3e5b2c4edd | |
| parent | 074c11161aecb1e0e1fc2e5db5588ca5519e4b46 [diff] | |
| parent | 48dad94919c9f5027559feed3b05d8d01a03f687 [diff] |
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 '48dad94919c9f5027559feed3b05d8d01a03f687': DO NOT MERGE Restore calling identity before checking permission