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

am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d:... 

am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev

* commit '6959a94f':
  DO NOT MERGE Restore calling identity before checking permission
parents 8514766a 6959a94f
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