commit | fd51bde24bcd19a265c8d54acbd12322caca91c2 | [log] [tgz] |
---|---|---|
author | Andy Hung <hunga@google.com> | Thu Dec 03 23:31:34 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 03 23:31:34 2015 +0000 |
tree | bcf4f94686e32ea9b03a881a870ce57c00c516f2 | |
parent | 67602582d989ce63e563a5d41f694ae3b4425a6b [diff] | |
parent | ffa5d53049208edea27b88f67e7cc62a2d259319 [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 am: 047cfaf95a am: 3abe346ed2 am: ffa5d53049 -s ours * commit 'ffa5d53049208edea27b88f67e7cc62a2d259319': DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread