Skip to content
Commit ee2e8fbe authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'mr' into mnc-dev 

* changes:
  Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
  Revert "Initial draft of new MediaRouter APIs."
parents f7f6fd2c 4244ce6a
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment