diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 22:57:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-19 22:57:11 +0000 |
| commit | 8ba176adc3c5650f403e69f9adcfb6d446fea6dc (patch) | |
| tree | 1edd8125e8a03c7dcadf9eba7a35625c9a2fe156 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fe47d509a43f6580f4d6e80b223132efe5a0e09a (diff) | |
| parent | e639ec7625dff6a2fbe69ae348be2a540e0b73bb (diff) | |
Merge changes from topic "am-3bddd89fd6b84d1b8c5e5210dcfc3870" into rvc-qpr-dev-plus-aosp
* changes:
Merge "[DO NOT MERGE] Support toggling resumption in Settings" into rvc-dev am: ab9e7facdf am: a3103b1c80 am: 639f947935
[DO NOT MERGE] Support toggling resumption in Settings am: c1bc307bce am: b11486a94b am: 1ec1cb0a37
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions