tree dc5113763a42e51570f4639b44dec726355d50e5
parent 4a115b747b8f681b60606b739252969791de2c24
parent 73683643a8575b47d6d8207ae5c76d934d432876
author Bryan Ferris <bferris@google.com> 1561514603 -0700
committer android-build-merger <android-build-merger@google.com> 1561514603 -0700

[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner() am: 13a804ee27 -s ours
am: 73683643a8 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf60 is in history

Change-Id: I84997bae1ac598cc018fd9cfe39c8b06f6800e61