| commit | 3abe346ed28c70a4e3612bf4081410414669b898 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Thu Dec 03 23:19:16 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 03 23:19:16 2015 +0000 |
| tree | 578b0aa02974b2dc51c7fc59327ad5d79f96ebf3 | |
| parent | 946388cc942d4804fe1f308715cdb5adf135e0cc [diff] | |
| parent | 047cfaf95aa5b2e4c18da78ce0f013c01aebe690 [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 * commit '047cfaf95aa5b2e4c18da78ce0f013c01aebe690': DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread