Skip to content
Commit 64bdf77d authored by Jon Larimer's avatar Jon Larimer Committed by Android Git Automerger
Browse files

am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am... 

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: 48dad949  -s ours automerge: 6fe42f08  -s ours

* commit '8bb65246':
parents 8b8d6195 8bb65246
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment