tree fa84a91b3e919900c2cab5646f87fb747c43d948
parent ed998e2475a90f55ec0d89290a228f99ca55617c
parent 2f43fd6c570e2c947ecadc6ffeb1685d605f2db0
author Kyunglyul Hyun <klhyun@google.com> 1570170185 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1570170185 +0000

Merge "MediaRouter: Add setControlCategories to MediaRouter"