OSDN Git Service

Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread...
authorAndy Hung <hunga@google.com>
Thu, 3 Dec 2015 23:14:49 +0000 (23:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Dec 2015 23:14:49 +0000 (23:14 +0000)
commit047cfaf95aa5b2e4c18da78ce0f013c01aebe690
tree8d1565c6ea5f2071ca4fffa3017cd76609d37ed1
parent29ff7f2ac7af5499dbbd6670b981251212831b60
parentb51610971c26307bf50dd4c9ff5a50f512e75d6a
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