diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 18:45:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 18:45:04 +0000 |
| commit | 9474ad08da8a2c6a2d170dc9e570780296817c14 (patch) | |
| tree | 2ba4e472ccef829567d5d76b698ce6b166754b74 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e215b88ebf1fddb8fd0fb9deb59f56b262ea6a75 (diff) | |
| parent | 287e7db4f9d1ad9ebd37bd79a81537479d231a93 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-qpr1-dev am: a752bb777d -s ours am: 265548dfa0 am: 9a1341ece4 am: 35b67cc7a1 am: 287e7db4f9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11409576
Change-Id: If5b79a0ea0b4fa1282db91ea59d0cc344ebe7c14
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions