tree d583dd0576ed4fb5f8e3f7d88ab85ea24e110a39
parent fdb4c3f447f8d4f4848ee3f94dde0f0f5da85489
parent 0f8190b067e180f8dfaa9ad99baeec9be1afcf6d
author Android Build Merger (Role) <android-build-merger@google.com> 1465879678 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1465879678 +0000

Merge "Merge \\"MediaRouter: Select/unselect route controllers for the updated route group\\" into nyc-dev am: f6a4ad301b am: 2744b5db2f" into nyc-mr1-dev-plus-aosp