diff options
| author | Christian Wailes <chriswailes@google.com> | 2019-06-10 15:25:56 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-10 15:25:56 -0700 |
| commit | 068b51383fa4b3a78eaa26e1e19a618f86a9f7bd (patch) | |
| tree | 6d9fc856ca63509dd8d63b64dfa54ef455dbc7c9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fb5ee6dad6fb76441af680cda6d7e211f8833eb0 (diff) | |
| parent | 5e468cf4ddf794f444c45ca8467a2a42de3d4195 (diff) | |
[automerger skipped] Merge "Fixes two data races in USAP pool management." into qt-dev
am: 5e468cf4dd -s ours
am skip reason: change_id Ie01637a10b356b80b5aa62291a97f2c167242827 with SHA1 f68c4e2ffa is in history
Change-Id: Iac707f390eba88848c63acdd2c0481ea5208ad1b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions