diff options
| author | Andy Hung <hunga@google.com> | 2019-09-13 14:52:46 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-13 14:52:46 -0700 |
| commit | 5a14c402843d3b4816391025ffa33b16d0d2d3a9 (patch) | |
| tree | 6af1fa35da3bc58788f6c5003e46750d1a8827c4 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 4cc8b546899dab5c69ff9e89c5ee5a8b2128eb11 (diff) | |
| parent | 420a76d379ed8432583590ed3dc815788ebc898f (diff) | |
[automerger skipped] Merge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END" am: 763cb4638a am: a52acaf833 am: e1ea2d25b5 -s ours
am: 420a76d379 -s ours
am skip reason: change_id I83b9b1d61b65dcc4a73d676e1f8be1e022c70302 with SHA1 3ce301c6f3 is in history
Change-Id: I319f32c4e617636feaa7d9e9765f8c001d5eacc2
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions