tree c31476482dc6668cb4ef1ec23007906519f36e93
parent 3e05a16899d60243133a0c775caa61733bec82b6
parent fc7c6ca4a3a48a8fbb6b895ed5f2a6e3c53d72b9
author Eric Laurent <elaurent@google.com> 1340041949 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340041949 -0700

am fc7c6ca4: am 89499268: Merge "Revert "Fix AudioManager.testRouting()."" into jb-dev

* commit 'fc7c6ca4a3a48a8fbb6b895ed5f2a6e3c53d72b9':
  Revert "Fix AudioManager.testRouting()."