diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 17:43:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 17:43:36 +0000 |
| commit | 265548dfa0c70a8d42e8d82b75c633bb4747400b (patch) | |
| tree | c22d447926470b6114eda474585a1361bb673d5f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0d425c2e4ebd92e0f121034e9060ae4f92bb4fe7 (diff) | |
| parent | a752bb777d4cd04562aa180d875e08c193f67ef1 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-qpr1-dev am: a752bb777d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11409576
Change-Id: I0b1619366be09f41dbd9c7be5084cb6ba6c79fd3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions