tree b4dc5910db49d99e943aa4ca5e5bcf4e0f915d5f
parent c1114596aa5bf30180d5a8c4e61c9eabaa3441dd
parent 1ec35da31dac8eed62d3b62229a41a23d15c6634
author Conrad Chen <conradchen@google.com> 1496797395 +0000
committer android-build-merger <android-build-merger@google.com> 1496797395 +0000

Merge "MediaRouter: Fix possible NPE in refreshRoute()" into oc-support-26.0-dev
am: 1ec35da31d

Change-Id: I569c95ff7132178129f4b107563ed11347a75809