diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 09:32:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 09:32:02 +0000 |
| commit | 15d348e4c505db40b601fdf439ac556eedda8a11 (patch) | |
| tree | 4478169cf3f3b4b270ac6422a3334e069c51aeeb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7c8779c098930ea469f1bcdad8f0c7908c1255d1 (diff) | |
| parent | 34ddad6f0a68b1966a2c5641a6fe67053556ccbb (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE" into pi-dev am: 34ddad6f0a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11367770
Change-Id: I6d65bb60b66e40827f6f137a25c2be6b23ee8875
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions