summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-02 19:15:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-02 19:15:20 +0000
commitd5992421c638c0b9d4829022ffb5f96e8777a21c (patch)
tree82e1fa40059b27287458ee58f10281ab2364b024 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentb89c6d94c58f65a44b84f0402c9c659da10f01b5 (diff)
parent5cc3fc49084dbdb312e137a76aa48c59388e6074 (diff)
[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140 Change-Id: Ie4932da5ffa8bc042a930b01a18d1ff1ce1abc90
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions