| commit | ee2e8fbe71444baac010d363cca9a113e12abdb6 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Thu May 07 01:31:23 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 07 01:31:28 2015 +0000 |
| tree | 1fb7036b422b11c0bafc604c70ebbc414fe9e2ee | |
| parent | f7f6fd2c0c1a185b658915e7e12fbd93560c7391 [diff] | |
| parent | 4244ce6a17063fd67fa174f7e551830c4df7d5bf [diff] |
Merge changes from topic 'mr' into mnc-dev * changes: Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS. Revert "Initial draft of new MediaRouter APIs."