| commit | d2f52928c566d7df33b0fa0e712f867cc0f75e41 | [log] [tgz] |
|---|---|---|
| author | Les Lee <lesl@google.com> | Mon Nov 15 15:51:35 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 15 15:51:35 2021 +0000 |
| tree | 7cface8c4095e8ec7bd019d7bcd6eafea3688810 | |
| parent | 9f6ea3d0b245c7bdf873f05e1fc7a54dd8a233b3 [diff] | |
| parent | d6f2ce6fede014cd5233255cc4e58e5e5863a46c [diff] |
[automerger skipped] [resolved conflict] Add test case to test normalize am: f444e9d182 am: fc719b474a -s ours am: d6f2ce6fed -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: I4e15e5cba4c6034a3126aa63dc3e5ad9765875ea