diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 22:44:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-19 22:44:20 +0000 |
| commit | 5a60f5cdb4660bef475f1c81074011bd79e2bada (patch) | |
| tree | 1edd8125e8a03c7dcadf9eba7a35625c9a2fe156 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f4a453db6deb0d66e2d9d2b0dd3b5d629630bf1f (diff) | |
| parent | dcbdf550946590d5a18573cf7ac1f4ff15525a35 (diff) | |
Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp
* changes:
Merge "[DO NOT MERGE] Support toggling resumption in Settings" into rvc-dev am: ab9e7facdf am: edfb2eddf9
[DO NOT MERGE] Support toggling resumption in Settings am: c1bc307bce am: 7a2dfd3422
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions