| commit | 047cfaf95aa5b2e4c18da78ce0f013c01aebe690 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Thu Dec 03 23:14:49 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 03 23:14:49 2015 +0000 |
| tree | 8d1565c6ea5f2071ca4fffa3017cd76609d37ed1 | |
| parent | 29ff7f2ac7af5499dbbd6670b981251212831b60 [diff] | |
| parent | b51610971c26307bf50dd4c9ff5a50f512e75d6a [diff] |
Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours am: 975bb62996 am: b51610971c * commit 'b51610971c26307bf50dd4c9ff5a50f512e75d6a': DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread