diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 23:32:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 23:32:25 +0000 |
| commit | e821d3b271deb7bcdd3dd7068006b4e610445792 (patch) | |
| tree | 5a7d6af2c5e4beb1fb327a4aecf88990330bc806 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dfcb09980aa82ec315cbd9fdf7150de0d3558ebc (diff) | |
| parent | f1f6def5870d2e646008551b38605da33549f5bf (diff) | |
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into oc-mr1-dev am: 239ab1c9d6 -s ours am: 03f7e9d6fc -s ours am: f0a0963d1d -s ours am: 44654288c0 -s ours am: 60312c6aa1 -s ours am: 53afbcef63 -s ours am: bfe3289439 -s ours am: f1f6def587 -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: I4ca18c8f3849fcdbae5decdd273104e1088260bf
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions