diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-25 14:01:52 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 14:01:52 -0700 |
| commit | 9317856dd13a6f287fe4c45be5953ba190ead2d5 (patch) | |
| tree | d725c0b56fb0560830b109909571570166cf2fb8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c28ebd70bd67096478f12c03779690d04573d92a (diff) | |
| parent | cc499ed88e9ff154dad14a6cfcc4aed2f78fda36 (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: cc499ed88e
Change-Id: I28b00d95c8637da380d0775d7b9ecdbae27313dd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions