commit | a99cfec38750aca06faae0a8640936406056aabe | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Dec 13 16:21:27 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 13 16:21:27 2021 +0000 |
tree | ecf2d56cb82c780d8df61c49e624fd9901282c89 | |
parent | 5e3516d6f1f426a35489fe01476fc93907123495 [diff] | |
parent | 208d820e9688b19ce761cc7f4f73691441900536 [diff] |
[automerger skipped] Merge "Register NSD service from ConnectivityFrameworkInitializerTiramisu" am: 6a8b9f3964 am: f9ed5725da am: 2755887938 am: 208d820e96 -s ours am skip reason: Merged-In Ibf89ab9a35e35dac4978ba70c7ab306b6155a4a3 with SHA-1 eb3dd7939f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1899035 Change-Id: I929428c369f61a5ecfc782556295745eb1290868