commit | 775f3375958d471df20579996cdebc56cfacba68 | [log] [tgz] |
---|---|---|
author | Paul Hu <paulhu@google.com> | Thu Jan 20 06:11:04 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 20 06:11:04 2022 +0000 |
tree | 3e7d71596b7c8927965057aeda467fc699afe6b8 | |
parent | 0de404b333ff1d1f7d353d51778b8aa1eb3fef07 [diff] | |
parent | 9cedf46327ef97d6fe4f37d45f6d79c34c327b6c [diff] |
[automerger skipped] Merge "Split out the nsd API surface and use framework-connectivity-tiramisu" am: f276eba866 am: 828de7c553 am: 199bf1724f -s ours am: 9cedf46327 -s ours am skip reason: Merged-In I72c7de124b9cc53f2263bd452ecd5f39e88e485b with SHA-1 4f563a4ed5 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1903750 Change-Id: I5762f4e5b778fea579b56529728ad4f61070f4df