diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-25 14:01:56 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 14:01:56 -0700 |
| commit | ef35b74e306c10fce7f4b4e2ef43fb334d9d223c (patch) | |
| tree | d725c0b56fb0560830b109909571570166cf2fb8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c28ebd70bd67096478f12c03779690d04573d92a (diff) | |
| parent | d914b96814c364373b04eac61e77ddaca78d5556 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into pi-dev am: 138f85570c -s ours am: ad8680bfcb
am: d914b96814
Change-Id: Iab6bfe78425df6d5ec4a3c53d683bfc9b05d2638
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions