| commit | e659fa63f3a5833e49cfd96659d5b219760ded55 | [log] [tgz] |
|---|---|---|
| author | Oriol Prieto Gasco <opg@google.com> | Tue Nov 16 01:14:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 16 01:14:42 2021 +0000 |
| tree | 7cface8c4095e8ec7bd019d7bcd6eafea3688810 | |
| parent | d2f52928c566d7df33b0fa0e712f867cc0f75e41 [diff] | |
| parent | a3d2f72c82baa1b401a06afebc39e749c8a5b9eb [diff] |
[automerger skipped] Revert "[resolved conflict] Add test case to test normalize am: f444e9d182" am: 48683e2439 -s ours am: a3d2f72c82 -s ours am skip reason: Merged-In I2f5790b9217357ddcf3f466cec1b2b1afbb47210 with SHA-1 f444e9d182 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16264980 Change-Id: I98bdb35879e1ebda1f493d62b07131716f4c22bd