Jeff Brown ee2e8fbe71 Merge changes from topic 'mr' into mnc-dev ...

* changes:
  Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
  Revert "Initial draft of new MediaRouter APIs."

2015-05-07 01:31:28 +00:00

..

java

Merge changes from topic 'mr' into mnc-dev

2015-05-07 01:31:28 +00:00

jni

Merge "Implement audio routing callbacks" into mnc-dev

2015-05-06 17:51:53 +00:00

res

Revert "Initial draft of new MediaRouter APIs."

2015-05-06 16:02:21 -07:00

tests

Add full backup criteria to android manifest

2015-05-03 16:19:27 -07:00