tree 745c10c2db038f0e549a6c97a5e5abd5bf3de137
parent 309f7abb3c170ba764e67e9b6fed31fb442e9953
parent 601477769cef254d3a95338e853a37ccf9aac63f
author Glenn Kasten <gkasten@google.com> 1376092162 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376092162 -0700

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

* commit '601477769cef254d3a95338e853a37ccf9aac63f':
  Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE