diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 02:36:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-10 02:36:42 +0000 |
| commit | 7e407ef9cb6419870fc7965981e16b03f12247f4 (patch) | |
| tree | 884167f03987e592389fcce8669d06b82d9479d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f187e7f1f9a01e875f5325351a9255360195e2c7 (diff) | |
| parent | 7306373e49e5689b3f2f2fbac33ec1c803cecde9 (diff) | |
Merge changes from topic "am-ff421f5c678447bf80a4adf729e40d01" into rvc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-dev am: d15b2f5bce am: 0d82d9ffc9 am: a4fbde5687 -s ours am: b1b2354740 -s ours am: 29802fb39f am: 378d3ae57d -s ours am: 8254a62829 am: baf4c15026 am: aa8904e175
[automerger skipped] [DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable am: 441247985a am: 40297a24eb am: 368eecbec0 -s ours am: b20d5c3add -s ours am: f69d6cfbbb am: 0bf1c91f92 -s ours am: 435a7cd8fb am: ecf2db455c am: fa6aefeac1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions