| commit | 109b1246c315ee58e74533c544404461a35f7580 | [log] [tgz] |
|---|---|---|
| author | Les Lee <lesl@google.com> | Fri Nov 12 11:03:41 2021 +0000 |
| committer | Les Lee <lesl@google.com> | Tue Nov 16 03:46:22 2021 +0000 |
| tree | 0fab1eaabb686d77fda86a8bb8cfcca3bce04d2f | |
| parent | 3a7b8f1e2bc456beb6562709fdbf753637c907c2 [diff] | |
| parent | f444e9d182a3c3a4064e2a70d590924c03743b90 [diff] |
[conflict] Add test case to test normalize am: f444e9d182 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16214695 Bug: 206073065 Bug: 206448852 Test: Test: I solemnly swear I tested this conflict resolution. Merged-In: I80c9f887cf8b4714716d657da92ed273a532ce27 Merged-In: I2f5790b9217357ddcf3f466cec1b2b1afbb47210