diff options
| author | Linus Tufvesson <lus@google.com> | 2020-06-03 12:16:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 12:16:21 +0000 |
| commit | f6d5e9eafc4963998c510441fd050801c914ab4a (patch) | |
| tree | 294d4515b24e58d14d989d53e1eab002153e29f9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 278c4994b666fe3b6b4e209316584b7bf6bcee95 (diff) | |
| parent | a5f045da44195cb0a2adb01299e4714052e6a96a (diff) | |
[automerger skipped] RESTRICT AUTOMERGE am: 78fe3b0aa2 am: c2a8913cf0 am: 12b250968b -s ours am: a5f045da44 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232
Change-Id: I288e4ab38f5bbd5c46d5184bc9f995e01b8ef5a9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions