Skip to content
Commit ad8680bf authored by Bryan Ferris's avatar Bryan Ferris Committed by android-build-merger
Browse files

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid... 

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into pi-dev
am: 138f8557 -s ours
am skip reason: subject contains skip directive

Change-Id: I6a094762a2cedb2aeba013bbd2a52adedac65963
parents 8f09cd3d 138f8557
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