tree 62004c7338d0d29223cdbdc74076b0e16bf16862
parent ee79857c524d91b6538dcff2cff2d8c4477e443a
parent 485ad62c2fd903fdd42a3d82f703ab07500e2a45
author Simon Dai <sdai@google.com> 1559261877 -0700
committer android-build-merger <android-build-merger@google.com> 1559261877 -0700

Merge "Fix NPE in media service during tests" into qt-dev
am: 485ad62c2f

Change-Id: Ie11772e020094cc5f916d1df9db12946e7a59658