commit | f59e507a6a31648ae5b3efb0848d5c789bab9e62 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jun 23 11:34:09 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 23 11:34:09 2022 +0000 |
tree | adb6a06d028e1cca6a08a572aead708e9c141039 | |
parent | a0d82d0894304e8f192ff365013573e2168b09d3 [diff] | |
parent | 25615d73759070143537c04381285e7551be94f5 [diff] |
[automerger skipped] Merge "Fix pro-guard rules for service-nearby" am: f2ac559aa3 am: 25615d7375 -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: Ifaa39e09daf669818f929e4b1373bfc57f5b426f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>