tree f79cec6876375c294fd32861003f7b75ad2fd655
parent f241f0f68e6a4c8f67cf0b7ce0ea4c588ea6a62a
parent 8a0e72d4546306afe12128bbcadd0f4402707122
author Stephen Barber <smbarber@google.com> 1452041505 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1452041505 +0000

Merge "Revert "Enable 4-channel input"" into mnc-dr-ryu-dev