| commit | b3b862ed2e8701d61df4d40b22fb55b5fff41bd7 | [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 | 31a2258afe7c7eb47e2ecb5ed92107eed9f36477 [diff] | |
| parent | 1b35c3f471cae7fd19e958373846679836d509fc [diff] |
Merge changes from topic 'adb-mdnsd' am: f4f95496ce am: 1b35c3f471 Change-Id: Ie93a0a2d4361bcc8d18d3433c0cc0369a864c815