| commit | adfdf42ce9260c6af2fd4994c44c108c50657fb5 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 01:47:58 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:47:58 2021 +0000 |
| tree | e29dd28cd632882fbbf69881cc1b37be277dc553 | |
| parent | 4d1cea3823f29260f338088e6a1f41f584c21504 [diff] | |
| parent | 803c76ebb57f5c709657b50dfa491a6142727543 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 1897304745 -s ours am: e4de0cd51e -s ours am skip reason: Merged-In I35fa4f887d941ec11922329855796f4d18dd5630 with SHA-1 c52f92de02 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1847163 Change-Id: I11b41ad6b137bc2c115852114b420d2075a381ee