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

am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am... 

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 '48dad949':
  DO NOT MERGE Restore calling identity before checking permission
parents 074c1116 48dad949
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