tree ab8e4c7f94c80fa457c4146ad8e8fe4fb5701436
parent ed043625654454462be451a63f5fd69adce67f98
parent 4ee774f322ad3292fcfbb3c120cf250643419425
author Glenn Kasten <gkasten@google.com> 1394227128 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394227128 +0000

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

* commit '4ee774f322ad3292fcfbb3c120cf250643419425':
  Simplify AudioTrack stream end and fix race