tree 73ff66c06401095bb8d9fc83f21a16e99a0165bc
parent e0c9d8afd0886162f19d28eb33c82878a0dada7d
parent bb1809ace7c3e38c40b3b84e63225613e638ee91
author Andy Hung <hunga@google.com> 1449183529 +0000
committer android-build-merger <android-build-merger@google.com> 1449183529 +0000

Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a  -s ours
am: bb1809ace7

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