[automerger skipped] Merge "Move DnsSdTxtRecord to net common static library" am: 8d6a6e0d4b am: 465199b9a0 -s ours am: 09cf091a6a -s ours
am:7cd5975424-s ours am skip reason: change_id I6118b313ce668707d598aa2eab9baee2f7622dbc with SHA13587754f22is in history Change-Id: I2d0f313ed921a696ac25af4ab0894789f6efeaec
This commit is contained in: