commit | 05b21f2ed40bb2de38de05eaf828848f22c6eb03 | [log] [tgz] |
---|---|---|
author | Aaron Huang <huangaaron@google.com> | Tue Mar 22 13:23:52 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 22 13:23:52 2022 +0000 |
tree | d65c262ef3a2ee5448990fca3f4f87fd4248f28e | |
parent | 203d976085e8d79e93f5e5db641aa55f9ec59663 [diff] | |
parent | b793c4cc469bcadfd7cf53b47d087a64c2932cb2 [diff] |
[automerger skipped] Merge "Fix proto invalid write type" am: a036ac4569 am: 18fe57024e am: 04eb319ab6 -s ours am: b793c4cc46 -s ours am skip reason: Merged-In I09cae385050e569b1da98ad7de0e226b13ee6895 with SHA-1 5d977f4b84 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2005290 Change-Id: I910dc62e5c2204e5f32c73a65fec889df7c2ed3a