diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 10:20:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 10:20:00 +0000 |
| commit | b4618e45775bce899ea01a76770fdfb43ac6963f (patch) | |
| tree | c72b7108cc0a13a6c9b687a45a48970047329d42 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2716d0640b6049b727a45e7f4b52b49a8451208c (diff) | |
| parent | 139e752d3e639ebf6d909c72d9f1ba784d83f7a8 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE" into pi-dev am: 34ddad6f0a -s ours am: 15d348e4c5 am: 3d3389fbac -s ours am: 139e752d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11367770
Change-Id: Idb2abb6cf20219dd8e5efa945cf407a10699786a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
