Commits
Jeff Brown authored and Android Git Automerger committed 8d605030fbbM
am ee2e8fbe: Merge changes from topic \'mr\' into mnc-dev * commit 'ee2e8fbe71444baac010d363cca9a113e12abdb6': Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS. Revert "Initial draft of new MediaRouter APIs."
Showing diff toee2e8fbe714