am 7473e356: (-s ours) am 943917c4: (-s ours) Merge "Fix SoundPool.play()...
am 7473e356: (-s ours) am 943917c4: (-s ours) Merge "Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE"
* commit '7473e356':
Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE