tree 3993c45b81c8c18d3b8e37a2472ffd9f75403ffc
parent 0b986a7b3d93a6a33d723d2d2d432e946b0ef331
parent fbce66cb259cb63b43fda654db68152b8b4a2c2f
author Adam Powell <adamp@google.com> 1339530168 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339530168 -0700

am fbce66cb: Merge "Further work on MediaRouter" into jb-dev

* commit 'fbce66cb259cb63b43fda654db68152b8b4a2c2f':
  Further work on MediaRouter