| commit | 180bc71afcf311c131fdcca5a05fdfb16beaa739 | [log] [tgz] |
|---|---|---|
| author | Frank Li <lifr@google.com> | Thu Dec 07 03:56:56 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 07 03:56:56 2023 +0000 |
| tree | ae0484b0507ed08f41bf8df2d48ebd0606387c5a | |
| parent | c9c3f7f86953a5ca73654762fcce92366eb0ba34 [diff] | |
| parent | 2334b0cb5cbc8fd4fed093614d8a1b4757db4c48 [diff] |
[automerger skipped] Merge "Correct field names and data types for apf atoms in networkstack" into main am: 7e823360fc am: 2334b0cb5c -s ours am skip reason: Merged-In I20857041a0d8aa8e829208a44208b8a1ddd14bd8 with SHA-1 0879358372 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2857385 Change-Id: I106b0bd9e377bb03998ba728f8b3391b60a5de75 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>