| commit | ca04fca501aa1b3ca979bd860bb722ba3e3e0662 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Jan 29 19:56:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 19:56:40 2015 +0000 |
| tree | a0c3ff70b6a365bc911f442c8d867a80892a7ac2 | |
| parent | 04ac1ad29b7148eb1c35a2c73ff1f9c68ed9fd84 [diff] | |
| parent | eb56f7a5dc66cb0ca54afd25a9d089e7931512df [diff] |
am eb56f7a5: am 4c2a6fdd: 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 o * commit 'eb56f7a5dc66cb0ca54afd25a9d089e7931512df':