From: Glenn Kasten <gkasten@google.com>
Date: Fri, 9 Aug 2013 23:45:49 +0000 (-0700)
Subject: am 7473e356: (-s ours) am 943917c4: (-s ours) Merge "Fix SoundPool.play() looping... 
X-Git-Tag: android-x86-6.0-r1~1918^2~382
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=601477769cef254d3a95338e853a37ccf9aac63f;p=android-x86%2Fframeworks-av.git

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

* commit '7473e356f5b7de6b67aef3b34faa6ddb1c054060':
  Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE
---

601477769cef254d3a95338e853a37ccf9aac63f