| commit | 53829915e70e1fa6834043b940f8c7e711adfb7f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:28 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:28 2021 +0000 |
| tree | 0e3485c5f4c0d4aadd93b971ca1109afa100cedf | |
| parent | 216d650e9ec2ce38d632596135ef465f5cf57871 [diff] | |
| parent | 964bca09f68ac1bfa73d0b2a87ff24ab22e20da0 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 4da69c29f0 -s ours am: 3acfa910a4 -s ours am: 964bca09f6 -s ours am skip reason: Merged-In I6b0f39925e8e65e183629522146d4338ea0f5aeb with SHA-1 43ae5a81df is already in history Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/1847121 Change-Id: I120a7d2002fefd968fd5fc9eb2421db175099d64