commit aa7b558f37015cd180bda88d24d60d8e90a8cb79
author Glenn Kasten <gkasten@google.com> Thu Aug 14 15:51:52 2014 -0700
committer The Android Automerger <android-build@android.com> Fri Aug 15 11:18:53 2014 -0700
tree 1165205b5ca7b3b9d1a9113c1679ef8710a4d5ee
parent 1054655d9327393aacdc675f08afbeb2f0894138

Temporary workaround for boot failure

Squashed commit of the following:

commit 99773ffa56d912bb585ea72b0bd8147d811aa56b
Author: Glenn Kasten <gkasten@google.com>
Date:   Thu Aug 14 15:12:29 2014 -0700

    Revert "flounder: audio: add support for offload"

    This reverts commit 62e1aabc8b0528bbacd3cd587933d6567027097c.

commit f68ef772f6c83cf0c246c075dabd35c28c0bea4f
Author: Glenn Kasten <gkasten@google.com>
Date:   Thu Aug 14 15:12:14 2014 -0700

    Revert "flounder: audio: fix headphone control name typo"

    This reverts commit eaf2647725208900eb48efb35bc8cf2e9333ba29.

commit 168e3f9cd3d4ca67e3442f3b09268eb7affd6221
Author: Glenn Kasten <gkasten@google.com>
Date:   Thu Aug 14 15:11:05 2014 -0700

    Revert "flounder: audio: Route pcm to low latency path"

    This reverts commit 302af93c0d414d8ff177199c279b1be9f3ab0e31.

Bug: 17034131
Change-Id: I406155176d55c03cd0e4f984047371d15e70ee8d

Conflicts:
	mixer_paths_0.xml