Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev

author Glenn Kasten <gkasten@google.com>

Thu, 17 Oct 2013 00:59:33 +0000 (00:59 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 17 Oct 2013 00:59:33 +0000 (00:59 +0000)
author Glenn Kasten <gkasten@google.com>
Thu, 17 Oct 2013 00:59:33 +0000 (00:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 17 Oct 2013 00:59:33 +0000 (00:59 +0000)
diff --cc media/libmedia/AudioTrack.cpp
Simple merge
author	Glenn Kasten <gkasten@google.com>
	Thu, 17 Oct 2013 00:59:33 +0000 (00:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 17 Oct 2013 00:59:33 +0000 (00:59 +0000)