tree cd3ee7b4306056ca9d5333538ff542d32b89a3b7
parent f68a5ecea5e3e3cfa6b4907b04a7621bf13cea0b
parent bb3228c2d9e38ec727cc0c48407b068427e26b72
author Paul Mclean <pmclean@google.com> 1439216573 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439216573 +0000

am bb3228c2: 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 'bb3228c2d9e38ec727cc0c48407b068427e26b72':
  Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."