Skip to content
Commit f8571c8a authored by Jon Larimer's avatar Jon Larimer Committed by android-build-merger
Browse files

am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before... 

am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
automerge: 7ab0ac69  -s ours

* commit '7ab0ac69':
  DO NOT MERGE Restore calling identity before checking permission
parents 5d7bd13f 7ab0ac69
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