| commit | d6f2ce6fede014cd5233255cc4e58e5e5863a46c | [log] [tgz] |
|---|---|---|
| author | Les Lee <lesl@google.com> | Mon Nov 15 15:39:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 15 15:39:27 2021 +0000 |
| tree | 58d648031e0837b786735560b06f09d356752acb | |
| parent | e75effbfe6f8fc6421d3804c2caf75a3803ebd5f [diff] | |
| parent | fc719b474aed2f28b48b589caa4b144a8d68d493 [diff] |
[automerger skipped] [resolved conflict] Add test case to test normalize am: f444e9d182 am: fc719b474a -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/+/16251687 Change-Id: I13b7568fd53d16ad450e73d66664d6ef190b8a9e