tree 6b63a0c462516c8c7ad109d090ea5c5197101ccc
parent 9517fd3634f3bf178737916be9c864f230b8108f
parent decf1c94c4e0adcb115462d22af80985da9475f8
author Xin Li <delphij@google.com> 1599795212 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795212 +0000

[automerger skipped] Merge Android R am: 7f4c14cc88 -s ours am: db2a369101 -s ours am: decf1c94c4 -s ours

am skip reason: Change-Id I8a6a13dc1fdd09f3851cbdee0bbb4165247b3735 with SHA-1 e67e65b47a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/BookmarkProvider/+/1422476

Change-Id: I97908934a8ae59646d7841773c586c16503f2ee4