tree 49772f58208ce1862c2cc3e96d37b4c601cf3522
parent a577233e74c33a14f99a82463b0173f9db11c137
parent 5ac3ff1595460c00b433c3a2ad4fd04aa4320f34
author Sungsoo <sungsoo@google.com> 1486176374 +0000
committer android-build-merger <android-build-merger@google.com> 1486176374 +0000

Merge "MediaRouter: Fix syncSystemRoutes behavior" into nyc-support-25.1-dev
am: 5ac3ff1595

Change-Id: Idbfd4e5b0e64559a199422416a6bd7098dbb1579