tree b7ffaab5ca73f722388a233b90f92e82087cbfe1
parent c5378ab518dfd5e4258d36d71df3d78a0cb76cdf
parent fa63af340a291532e50b86fd0f4bab3e3060ef36
author Paul Mclean <pmclean@google.com> 1439216206 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439216206 +0000

am fa63af34: am c81abd9a: am 1d19dc58: am beda6e2b: Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev

* commit 'fa63af340a291532e50b86fd0f4bab3e3060ef36':
  Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."