diff options
| author | Bill Yi <byi@google.com> | 2021-02-04 18:19:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-04 18:19:15 +0000 |
| commit | ed379ba11fb86e621c5ccac56eda01dcaf14ad83 (patch) | |
| tree | ad7919218bd130b09c44d5a2ea90523bc24e2c2e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 57dd6872fd203cd93d955cf560c68790008cf7ee (diff) | |
| parent | e412ab4ec6438003d0e3d597f10954ec4dd9269b (diff) | |
[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: e412ab4ec6 -s ours
am skip reason: Change-Id Icbc3c9f8e1ac8064e2e006587b4d4870d74cee2d with SHA-1 ce1b075b2b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idf7242bf6f0de5e65252ea085bd3da7766810272
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions