commit | a85126f33fa203364fac8b156656a17fbea4ee1c | [log] [tgz] |
---|---|---|
author | Frank Li <lifr@google.com> | Thu Dec 07 04:10:58 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 07 04:10:58 2023 +0000 |
tree | 368e25144a79844ab5ac5a851b332833baf993b7 | |
parent | 059b5fb19392052ff49a1daf47b0cd05fbe0bdc2 [diff] | |
parent | c9c3f7f86953a5ca73654762fcce92366eb0ba34 [diff] |
[automerger skipped] Merge "Correct field names and data types for apf atoms in networkstack" into main am: 7e823360fc am: 950a2c835d am: c9c3f7f869 -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: I5cdae8f619446a96258682aa8a3a95deb5e05dfd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>