tree 0291fd7a5121f7861a1280a290559371cfa14d7a
parent 9790c889d60c1422fcd3ebadb3fbd1523831319e
parent 9779bdd05e1d913130a7a35c983705c3f5411d6b
author Ian Ni-Lewis <ilewis@google.com> 1374197342 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1374197348 +0000

Merge "Added BasicMediaRouter sample based on the PresentationWithMediaRouterActivity API demo." into jb-mr2-dev