tree 6112019db06f1b36ecaaffb6c0033d3619ef0a6b
parent 2048dd5483c76892f5c5d54ad54e9782073bed5c
parent adfda28b4211812737fd7a6d7b9729dbef35be93
author Andy Hung <hunga@google.com> 1449183765 +0000
committer android-build-merger <android-build-merger@google.com> 1449183765 +0000

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

* commit 'adfda28b4211812737fd7a6d7b9729dbef35be93':
  DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread