diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 18:50:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-03 18:50:25 +0000 |
| commit | 3f4365465a202c49c539764664052e6f99ffa00a (patch) | |
| tree | 75a8f594d1851e840c4f58f3bf8c423cf39ef16a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 82f0cfb70ac09a5cae20a5cc1ad95541109876c4 (diff) | |
| parent | b1b0b7aad5d7cfbb725ec2b90c73c47432da8a16 (diff) | |
Merge changes from topic "am-ab51d82da2774cb6ad7daad8fa5ac84e" into rvc-d1-dev-plus-aosp
* changes:
Merge changes from topic "am-35a2a7dc166049afa7b7683d9a6ad486" into rvc-dev am: 65b5eb12d5 am: 17f7cefee9
[automerger skipped] Merge "DO NOT MERGE Prevent ImageWallpaper from crashing due to wide gamut" into qt-dev am: 04ee91a8a5 am: dd974dc848 -s ours am: 17416bcf80 am: 3402d6dc72
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions