Merge "audioflinger: add HOTWORD audio source." into klp-dev

author Eric Laurent <elaurent@google.com>

Thu, 12 Sep 2013 00:15:15 +0000 (00:15 +0000)

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

Thu, 12 Sep 2013 00:15:15 +0000 (00:15 +0000)
author Eric Laurent <elaurent@google.com>
Thu, 12 Sep 2013 00:15:15 +0000 (00:15 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 12 Sep 2013 00:15:15 +0000 (00:15 +0000)
diff --cc services/audioflinger/Tracks.cpp
Simple merge
author	Eric Laurent <elaurent@google.com>
	Thu, 12 Sep 2013 00:15:15 +0000 (00:15 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 12 Sep 2013 00:15:15 +0000 (00:15 +0000)