commit | de60fa8b6336b162dbf25aa59d10433406a53ad2 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jun 23 11:16:52 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 23 11:16:52 2022 +0000 |
tree | 5ef7be44c68b2c52444027eab2c906223ed7ab59 | |
parent | 2b601530d0f0c8d83577b780afe8885f1aac66e0 [diff] | |
parent | f2ac559aa3bc4f88b707fbc1fafd2b1e7379985e [diff] |
[automerger skipped] Merge "Fix pro-guard rules for service-nearby" am: f2ac559aa3 -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: I7d61cd46d8c07f0461b2bb6482b5d710bf7f829e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>