Commits
Jon Larimer authored and Android Git Automerger committed 64bdf77d951M
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 '8bb65246f2655fae8d807db973c5eaeff78733cc':
Showing diff to8b8d61952a4