OSDN Git Service

Merge "Fix NPE in MediaRouterService" into oc-dr1-dev am: bba60fadc7
authorSungsoo Lim <sungsoo@google.com>
Wed, 26 Jul 2017 19:49:09 +0000 (19:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 19:49:09 +0000 (19:49 +0000)
am: 95baa7765c

Change-Id: I787abff50bc59bc2b93794b33f02e218a5c14b10


Trivial merge