| commit | 94f62d55046af1c7b33c82a8bea3342822b2b357 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jun 23 11:33:50 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 23 11:33:50 2022 +0000 |
| tree | cef01baeebc015cdca27ec8641fc5b3ab9930be9 | |
| parent | dbcbf0f1df9d14b8ee132937dbf4e34c26d7bea6 [diff] | |
| parent | de60fa8b6336b162dbf25aa59d10433406a53ad2 [diff] |
[automerger skipped] Merge "Fix pro-guard rules for service-nearby" am: f2ac559aa3 -s ours am: de60fa8b63 -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: I1db46b63144083691dd4bdaad905936a3fbc80ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>