| commit | e4f1ffbbef42777fc4deb200f7b2f47284b87fcf | [log] [tgz] |
|---|---|---|
| author | Casey Dahlin <sadmac@google.com> | Fri Mar 10 01:21:24 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 10 01:21:24 2017 +0000 |
| tree | 284e55310bf831ffba69ee5e870d0961a21bafff | |
| parent | 06a68c519049d6a9e3836fe7d08f1c22a03d101d [diff] | |
| parent | f09793bc980b0d1824dc921ef82b540c68f8810f [diff] |
Merge changes from topic 'adb-mdnsd' am: f4f95496ce am: 1b35c3f471 Change-Id: Ie93a0a2d4361bcc8d18d3433c0cc0369a864c815