| commit | 105e9b5ed888ded6801c0dc57f7ffbdf64aa9fb5 | [log] [tgz] |
|---|---|---|
| author | Casey Dahlin <sadmac@google.com> | Fri Mar 10 03:16:29 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 10 03:16:29 2017 +0000 |
| tree | 16cec78a4e6131b91e743c32bdb073d41b02861f | |
| parent | 64c3954a373eabcf08b5275af0bbf270f2daf143 [diff] | |
| parent | b3b862ed2e8701d61df4d40b22fb55b5fff41bd7 [diff] |
Merge changes from topic 'adb-mdnsd' am: f4f95496ce am: 1b35c3f471 am: b3b862ed2e Change-Id: I76a582914bb4d88350b9c9e1a30f99b2917b5b5a