Merge "Modify JavaDoc of MediaBrowserService.getBrowserRootHints"