| commit | 04debdfefa8d4874104693cea9678a4bc8426a15 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jun 23 12:02:12 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 23 12:02:12 2022 +0000 |
| tree | adb6a06d028e1cca6a08a572aead708e9c141039 | |
| parent | 2037fcc02100fc775ee0e410fba5eebbace17098 [diff] | |
| parent | f59e507a6a31648ae5b3efb0848d5c789bab9e62 [diff] |
[automerger skipped] Merge "Fix pro-guard rules for service-nearby" am: f2ac559aa3 am: 25615d7375 -s ours am: f59e507a6a -s ours am skip reason: Merged-In I9f7db4509bf8fe736f5d9fc08b164a20b2274aa8 with SHA-1 007171237e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2134276 Change-Id: Id63fb6730ce7972c99a189bf0c4d3b8834da57e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>