tree 6b63a0c462516c8c7ad109d090ea5c5197101ccc
parent 32d4e3882f0d854be4c8d3bfe22bd56a0a97fb4a
parent db2a3691016df97326f7833a2a921e6ecb8e35a5
author Xin Li <delphij@google.com> 1599789761 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789761 +0000

[automerger skipped] Merge Android R am: 7f4c14cc88 -s ours am: db2a369101 -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: I18f2ac405c5be1483fd3bef6683f7e7b2bb88e9c