commit | ab8659cf4ff1acd0923494a66e803c67d229fe94 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 08:30:03 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:30:03 2021 +0000 |
tree | 68751435c9bce017b6518cd21c75ed8fd174f776 | |
parent | 878abac790fcb94f64f095c22e3e90271391d0cd [diff] | |
parent | 67ee51673274064144fe12fa0efa6abeb7608cee [diff] |
[automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours am: 0d63d026fb -s ours am: 1fc4fa89ea -s ours am: 67ee516732 -s ours am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1847635 Change-Id: I9c73f7dcd07233f25b26cd47e68352ec18cb6622