commit | 7cd32de879202a9f1cf95fe3483f954bcbb0960f | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 22 06:54:29 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 22 06:54:29 2020 +0000 |
tree | b8a4150ed3e22ef4f13c4aa7bf550598b1756fa7 | |
parent | 07b2f6adc7c8c1fd1cd8e13757c5ac8a6d608fa5 [diff] | |
parent | fd71d872b21d4fd6beae4a1c54144db0c6ecc18d [diff] |
[automerger skipped] Merge "Statically link DnsSdTxtRecord into framework-wifi" am: 13b853571f am: 9d348a16d9 am: 72e09722e4 -s ours am skip reason: Change-Id Ic5f7decfdbc3116a15fe8da3841cc7620105996d with SHA-1 40b3a51ccb is in history Change-Id: I3e734185856a7eb67b8c5530ac83b67da46dbb70