OSDN Git Service

am e45796de: am dedc7b0f: Merge "Fix flush() followed by start()" into klp-dev
authorGlenn Kasten <gkasten@google.com>
Thu, 17 Oct 2013 23:23:39 +0000 (16:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Oct 2013 23:23:39 +0000 (16:23 -0700)
* commit 'e45796dee9c072cdb13a00b407e68be2cd55e2f2':
  Fix flush() followed by start()

1  2 
services/audioflinger/Tracks.cpp

Simple merge