OSDN Git Service

Merge "Fix NPE in MediaRouterService" into oc-mr1-dev