summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorChris Tate <ctate@android.com>2020-06-03 22:24:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 22:24:33 +0000
commit0295276dfa4d0b528d642e262db2e543cc36fcfe (patch)
tree17e15aad9ee964ce72f75b330e64616e9f1d2529 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent89600e228921d1bfd25c0d47cf9c4527157e8fd9 (diff)
parentf56666c5248c1248f328e746598ee44caabc7533 (diff)
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into pi-dev am: f56666c524 -s ours
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 5f647cd3f2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602837 Change-Id: I686dd592f9d37b5a365473d0db3ece81e935bba6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions