tree 227c2b5c7acc6a7ec1b528ed6b14bbdf97554f85
parent 592bbfa2c2d81b50de412c96c13a15d519bea5af
parent f608cc3e9223a3d695055852b5b7b26fa20715a3
author Zim <zezeozue@google.com> 1628893006 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628893006 +0000

[automerger skipped] DO NOT MERGE Fix CVE-2020-15358 and CVE-2020-13871 am: 201685e798 am: 8c6dff81aa -s ours am: ab213bd721 -s ours am: f608cc3e92 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sqlite/+/15261414

Change-Id: Id3a2f39bb4159615d50dbc57e5b655696680aa20