tree 8568ccff1e66e32af5fdb7ce34b65441db0a53b6
parent 9374513f953e64caf4f8b52a1c4f1f49e962984c
parent 77a85ebe1fc28f3af07ebefeea53fad778f442c0
author Glenn Kasten <gkasten@google.com> 1394235528 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394235528 +0000

am 77a85ebe: am 4ee774f3: am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev

* commit '77a85ebe1fc28f3af07ebefeea53fad778f442c0':
  Simplify AudioTrack stream end and fix race