tree bdd722d0d8a638bf369562cb8998596e9d4a81b0
parent 2363fd25a8767731c3819ea7532f36964633acb5
parent 4576d5ef4427874bd98c0f0825841174b98b301e
author Jeff Brown <jeffbrown@google.com> 1408505834 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408505834 +0000

am 4576d5ef: (-s ours) am 4faea310: Remove incomplete media router API. (DO NOT MERGE)

* commit '4576d5ef4427874bd98c0f0825841174b98b301e':
  Remove incomplete media router API. (DO NOT MERGE)