| commit | b1db2edd26d251a769c3fa8962648c49aef63e37 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 19:51:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 19:51:05 2015 +0000 |
| tree | 459807b0138fd46d02f5d494a4f117d53c14b7e7 | |
| parent | f3bdb5332116328b17d5f2a3033e4d679ac26cec [diff] | |
| parent | 4c2a6fddb10a8b4c00391d54371aaa14f5d901ce [diff] |
am 4c2a6fdd: (-s ours) am 64bdf77d: am 8bb65246: 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 automerge: 48dad94 -s ours automerge: 6fe42f0 -s ours * commit '4c2a6fddb10a8b4c00391d54371aaa14f5d901ce':