tree 2202e009d4c9284e26d729676ec90e2408347671
parent e213c6813e5abe51d1359bacc1ae5f0ca5367505
parent 99985d98c23b32acc0014031d7b88ee4eed21a4b
author Marco Nelissen <marcone@google.com> 1422383333 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422383333 +0000

am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"

* commit '99985d98c23b32acc0014031d7b88ee4eed21a4b':
  Make SoundPool use MediaCodec