commit | b51610971c26307bf50dd4c9ff5a50f512e75d6a | [log] [tgz] |
---|---|---|
author | Andy Hung <hunga@google.com> | Thu Dec 03 23:11:15 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 03 23:11:15 2015 +0000 |
tree | 3d142814f8a856dd51f44a20637b8434dfa2a9ec | |
parent | f766fdb62590cc3c233ba51c45f2b4aade6483d4 [diff] | |
parent | 975bb62996d194c43ceb5f4a34f58870a1004e59 [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 * commit '975bb62996d194c43ceb5f4a34f58870a1004e59': DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread