| tag | a60f917a65d53902c37d5a5e870744bccde1262c | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 15 15:40:36 2022 -0700 |
| object | a4d3a54782d5621be4d331e394cddfa99fb05dd7 |
Android Mainline 12.0.0 Release 122 (8559627,com.google.android.networkstack)
| commit | a4d3a54782d5621be4d331e394cddfa99fb05dd7 | [log] [tgz] |
|---|---|---|
| author | Roland Levillain <rpl@google.com> | Mon Jul 12 12:46:58 2021 +0100 |
| committer | Roland Levillain <rpl@google.com> | Mon Jul 12 13:05:07 2021 +0100 |
| tree | dafcda0444cbbfe9bfba06475c7631c3b2889fb1 | |
| parent | b51664fdd7e7835cd23aa9acc13a1e757c6153e4 [diff] | |
| parent | c23a0eedfbb82a263e720828d4ec4fc3ad41bc7f [diff] |
resolve merge conflicts of c23a0eedfbb82a263e720828d4ec4fc3ad41bc7f to sc-mainline-prod Update D8 and R8 to 3.0.41-sc03 Built here: go/r8-releases/raw/3.0.41-sc03 Test: I solemnly swear I tested this conflict resolution. Bug: 191505691 Change-Id: I804b7417602f48bead378fbe62bbf54c8cf156f5 Merged-In: I823ae0c589118fc4a1463f49332a0d96c1991a96