tree 0835c4a87dadb99e61723187a9f06e4c2c90fb25
parent f4244f579d424a04125c8e7ae81e8988e722e081
parent 6e14c5705c5acf9d6036060252f257a084cd7578
author Marco Nelissen <marcone@google.com> 1422401585 +0000
committer android-build-merger <android-build-merger@google.com> 1422401585 +0000

am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"
automerge: 6e14c57

* commit '6e14c5705c5acf9d6036060252f257a084cd7578':
  Make SoundPool use MediaCodec