commit | dcbf706b05b7ae245177b51d80b80d0743194e3e | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Aug 16 15:13:54 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 16 15:13:54 2021 +0000 |
tree | 0b6da1a5c2c348013e68e6b7ff4851d63484b1bd | |
parent | 2c48378de7e052db4d5834f18592704560266c28 [diff] | |
parent | 6ea8572c063466c0a62353ae496695d55ea79c88 [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: b5c6036c29 -s ours am: 6ea8572c06 -s ours am skip reason: Merged-In I592dd5f1d6e13b020beadb11b9d913857a82e524 with SHA-1 58b493abf6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15546967 Change-Id: I9fe42633558bc4541fe5da63b4351bd4c150ab3f