summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/Program.java
diff options
context:
space:
mode:
authorChris Tate <ctate@android.com>2020-06-03 22:24:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 22:24:24 +0000
commit03f7e9d6fc7b2b7c8c1c031ebf56392cf1ffd5d5 (patch)
treef84fbfdfd808ee98d52a6cdfe727ddac4436d505 /rs/java/android/renderscript/Program.java
parentf56666c5248c1248f328e746598ee44caabc7533 (diff)
parent239ab1c9d6d7280f623b9591ac47b9c5297750a5 (diff)
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into oc-mr1-dev am: 239ab1c9d6 -s ours
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 9f8923d54a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602836 Change-Id: Ic6abfc0ae396a514e7712c6fbc65662152cd1165
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions