OSDN Git Service

Merge "MediaRouter work" into jb-dev
authorAdam Powell <adamp@google.com>
Tue, 12 Jun 2012 19:04:24 +0000 (12:04 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 Jun 2012 19:04:24 +0000 (12:04 -0700)

Trivial merge