| commit | 37e551699025542471e50602c1baf5eb2a348b6f | [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 | cc12e207976c286fa7672e4f8676344f2096bc25 | |
| parent | 42cf9f806bea56f3396f590f9df1b06cf6f55998 [diff] | |
| parent | a1d052ddf9a3366cc1e623e03f2be7a7a002e84c [diff] |
[automerger skipped] Merge "Split out the nsd API surface and use framework-connectivity-tiramisu" am: 64f906a06a am: 08ee901ba4 am: a1d052ddf9 -s ours am skip reason: Merged-In I72c7de124b9cc53f2263bd452ecd5f39e88e485b with SHA-1 0b275143fc is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1903750 Change-Id: Id4af2c02266784295abbeb4c95491ef7a5f25e66