tree e8492a4c25a81f44bef5624bd8b0df5411e17f6b
parent 88d88df17436f53894dd14c0523c1d53148cec79
parent 9eff11ebb17e9e7b66b3c6e56c967018e17fa1e1
author Bryan Ferris <bferris@google.com> 1561517672 -0700
committer android-build-merger <android-build-merger@google.com> 1561517672 -0700

[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner() am: 13a804ee27 -s ours am: 73683643a8 -s ours am: a7d55adc89 -s ours
am: 9eff11ebb1 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic37556cb1dbdb7dfbd58109ca9e96eb14a5e718c