tree 97de2eb6c6a4e67bc977cb6c191191112cee28bb
parent 8f09cd3de1f40bec494aa3e0bb6e520e407a0a04
parent 138f85570c22a4fb7333bb314b7e5313f1de9667
author Bryan Ferris <bferris@google.com> 1561491445 -0700
committer android-build-merger <android-build-merger@google.com> 1561491445 -0700

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

Change-Id: I6a094762a2cedb2aeba013bbd2a52adedac65963