tree 8de7f6bdc028ddb90379e6b9cdaa9ed798de7ddc
parent d7ff18dac8f9bb618977bfcfb293e49ded056121
parent 097feb206815a105a027ab90960a97184300ff88
author TreeHugger Robot <treehugger-gerrit@google.com> 1501094498 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501094498 +0000

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