| commit | 2defd8a7f1ce5ea841d09917bad0a1867c3cd3ae | [log] [tgz] |
|---|---|---|
| author | Les Lee <lesl@google.com> | Thu Nov 18 02:23:08 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 18 02:23:08 2021 +0000 |
| tree | 91e6893fd1a675ce79f070d5fc3c6d1220bb9846 | |
| parent | 7631da5c311a9dbdcf3b6d93de670ea04668601f [diff] | |
| parent | 21fe2e30d432fed871f928aee289e7ff73b4c0d0 [diff] |
[automerger skipped] Merge "[conflict] Add test case to test normalize am: f444e9d182" into sc-v2-dev am: 28da18e286 -s ours am: 21fe2e30d4 -s ours am skip reason: Merged-In I2f5790b9217357ddcf3f466cec1b2b1afbb47210 with SHA-1 f444e9d182 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16247421 Change-Id: Ie03305b75f532dd7f3a8d1fea2a5afc03c019956