commit | f09793bc980b0d1824dc921ef82b540c68f8810f | [log] [tgz] |
---|---|---|
author | Casey Dahlin <sadmac@google.com> | Fri Mar 10 01:16:46 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Mar 10 01:16:46 2017 +0000 |
tree | 284e55310bf831ffba69ee5e870d0961a21bafff | |
parent | e6f211d4a31016ca355d4ef563cfa764dc745333 [diff] | |
parent | bbc6c0e80e4b852ef03e2ed8056381e759806881 [diff] |
Merge changes from topic 'adb-mdnsd' am: f4f95496ce Change-Id: I1749f913b8c5cca64880d3eec3009f850bc9141e