tree 0fab1eaabb686d77fda86a8bb8cfcca3bce04d2f
parent 3a7b8f1e2bc456beb6562709fdbf753637c907c2
author Les Lee <lesl@google.com> 1636941531 +0000
committer Les Lee <lesl@google.com> 1636975594 +0000

[resolved 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
Change-Id: I2bbac80ae1b2f64166d6598f72e156b23c0f019e
Merged-In: I80c9f887cf8b4714716d657da92ed273a532ce27
Merged-In: I2f5790b9217357ddcf3f466cec1b2b1afbb47210
Test: Test: I solemnly swear I tested this conflict resolution.