| commit | 21fe2e30d432fed871f928aee289e7ff73b4c0d0 | [log] [tgz] |
|---|---|---|
| author | Les Lee <lesl@google.com> | Thu Nov 18 02:05:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 18 02:05:50 2021 +0000 |
| tree | 11be72e0e0e4d41e71f107f7258eff4402b5d266 | |
| parent | 096cd70a0470cf4d5bf0774c0c9ce557b6e0f0d6 [diff] | |
| parent | 28da18e28630c5c8621f773847dfd79d499df1ee [diff] |
[automerger skipped] Merge "[conflict] Add test case to test normalize am: f444e9d182" into sc-v2-dev am: 28da18e286 -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: I6fd2d10a258a7dd68c18cc69cb7c1493e222c512