tree 58ab7125933e2f3460e292a5f87e0b86983acc44
parent e618963b93c81694124d61eab6528cabf5edfdc8
parent 1d19dc588f2e34bcbee39acc4f9636bec4ab3b17
author Paul Mclean <pmclean@google.com> 1439215209 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439215209 +0000

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

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