diff options
| author | Eugene Susla <eugenesusla@google.com> | 2020-11-05 23:52:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-05 23:52:35 +0000 |
| commit | 2e441d94272135055a66e121e75f5a292d4e95a1 (patch) | |
| tree | 5b3ddcfaa0694d340e2062e1e550dc57277663c2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e7009a5c2c5f3d79a2c8592ac4f35ce66947f608 (diff) | |
| parent | e73fb74354ca018dac04e96686865b8ad1bdb058 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE am: e8551a88f6 am: 6b6c135380 am: 2c54e6259a -s ours am: bcea247e03 -s ours am: 11c4f67eea am: 518a3cfaab -s ours am: a7bc88f935 am: 5ca3e9d694 am: 0b08effbf1 am: e73fb74354 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12950101
Change-Id: Ie28a349f534b9aeab6a8e996b615ad4ed0c2e5a8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions