summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramStore.java
diff options
context:
space:
mode:
authorChris Tate <ctate@android.com>2020-06-03 22:36:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 22:36:09 +0000
commita4e79c7d165c25188d89f316d44ec72e3338401e (patch)
treea78c4c8f133dddd177499c2a9bddd5d685840f9d /rs/java/android/renderscript/ProgramStore.java
parent09a6961f20caf2292827d3105374cc8c629e8223 (diff)
parent86dcec42d1673f3a27abeae75fc33eb8b4aeeee1 (diff)
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into qt-qpr1-dev am: 480dc8cde6 -s ours am: 86dcec42d1 -s ours
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 b2e84f0406 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11605558 Change-Id: Iea55df7a21e6a283b00c079ec112dbdcb7010c23
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions