Skip to content
Commit 1a3f859c 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 oc-mr1-dev
am: 97111a1c -s ours
am skip reason: subject contains skip directive

Change-Id: I5210f8aed11e5b43bc09ce61f91ea399faa3dc4a
parents 138f8557 97111a1c
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