OSDN Git Service

Merge "Fix NPE in MediaRouterService" into oc-dr1-dev am: bba60fadc7
authorSungsoo Lim <sungsoo@google.com>
Wed, 26 Jul 2017 20:00:40 +0000 (20:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 20:00:40 +0000 (20:00 +0000)
am: 5a3d561e2d

Change-Id: Ie2f4ccb46e0de6b177ff1f13ecc95fa7cabb04f9


Trivial merge