| commit | f19859a01761140c6a65a2a3e3fb7399f5fd8d54 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jun 23 12:44:56 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 23 12:44:56 2022 +0000 |
| tree | cef01baeebc015cdca27ec8641fc5b3ab9930be9 | |
| parent | 94f62d55046af1c7b33c82a8bea3342822b2b357 [diff] | |
| parent | 8001bdebf35339964a6243e74fb66670cf6c6b59 [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: 8001bdebf3 -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: Ia0a876b05a38baac4a09e551946e6cf9d1836bf9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>