OSDN Git Service

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

Change-Id: I6304c6adf97f935235e1598b678fa15185c31b8b


Trivial merge