commit | 30a866fdc30ad3d456984acec2ed1184676b1dd8 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:58:50 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:58:50 2020 +0000 |
tree | 05b507f96168f76e8c985ad05a083b35d92bd688 | |
parent | 79de37b731eedfd5675763da881b6db7389a624d [diff] | |
parent | 14d6d7f540b4cb61243100e7061562c72ee63199 [diff] |
[automerger skipped] Merge "Merge Android R" am: ea2e736293 -s ours am: a90d89be09 -s ours am: 0b44dceeb3 -s ours am: 14d6d7f540 -s ours am skip reason: Change-Id I2e910257538c52e37e67ca9fe884daa80219415b with SHA-1 d0c7632b0e is in history Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/1422391 Change-Id: I18a56de3e79fc14abb352eed00a80babe7396044