commit | 8001bdebf35339964a6243e74fb66670cf6c6b59 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jun 23 12:27:02 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 23 12:27:02 2022 +0000 |
tree | adb6a06d028e1cca6a08a572aead708e9c141039 | |
parent | 872d153b5cf62dc360dc71b6c55933ff7f1ef745 [diff] | |
parent | 04debdfefa8d4874104693cea9678a4bc8426a15 [diff] |
[automerger skipped] Merge "Fix pro-guard rules for service-nearby" am: f2ac559aa3 am: 25615d7375 -s ours am: f59e507a6a -s ours am: 04debdfefa -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: Idef76e09ee0a624e107c2e2f040471011fdda7b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>