diff options
| author | Christian Wailes <chriswailes@google.com> | 2019-06-10 15:41:50 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-10 15:41:50 -0700 |
| commit | 4d8f4151acb481fa3c8ad4fd0310afc54d7dbd64 (patch) | |
| tree | 92343b7e81bbc6c62c60af7db76ac47bc395ad08 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2309caaa523f8e047f5f560b20ed081037120b2b (diff) | |
| parent | bd79bb3dda64b3a13c12ddec8cd664ab438e3a73 (diff) | |
[automerger skipped] Merge "Fixes two data races in USAP pool management." into qt-dev am: 5e468cf4dd -s ours am: 068b51383f -s ours
am: bd79bb3dda -s ours
am skip reason: change_id Ie01637a10b356b80b5aa62291a97f2c167242827 with SHA1 fb329ba7c8 is in history
Change-Id: I99ddd5b8cc3d41ce75aac6cb8aa757fdcde8d2a9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions