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)
commit9400c41dac67cd9998f17ba2a0a321270c52428e
tree4030f955f0be0aa2043bfc0f62573874c9b9348d
parentd2f11ea57916f981370ae232f7088490c4dbc74f
parent5a3d561e2d46122dca7e9ff022f365bca0f75aae
Merge "Fix NPE in MediaRouterService" into oc-dr1-dev am: bba60fadc7
am: 5a3d561e2d

Change-Id: Ie2f4ccb46e0de6b177ff1f13ecc95fa7cabb04f9