diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-25 21:03:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-25 21:03:15 +0000 |
| commit | 66f2e6ec7b410a46cce5651f2b1f52d154ccf096 (patch) | |
| tree | d725c0b56fb0560830b109909571570166cf2fb8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9317856dd13a6f287fe4c45be5953ba190ead2d5 (diff) | |
| parent | ef35b74e306c10fce7f4b4e2ef43fb334d9d223c (diff) | |
Merge "[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" into qt-r1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions