commit | 9cedf46327ef97d6fe4f37d45f6d79c34c327b6c | [log] [tgz] |
---|---|---|
author | Paul Hu <paulhu@google.com> | Thu Jan 20 05:49:38 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 20 05:49:38 2022 +0000 |
tree | fdb3c2a684297093961b9d3037e81d83a8153450 | |
parent | e3f20e0d4fa068259c8cadac90415102fe96592b [diff] | |
parent | 199bf1724f1898b9176d8a4a29977119616f91de [diff] |
[automerger skipped] Merge "Split out the nsd API surface and use framework-connectivity-tiramisu" am: f276eba866 am: 828de7c553 am: 199bf1724f -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: Id4af2c02266784295abbeb4c95491ef7a5f25e66