tree 6b63a0c462516c8c7ad109d090ea5c5197101ccc
parent 2b35704ebcdde13cc6efaeb8cb13ff7f6b1f90ac
parent 7971a2d667b3fe6e945e5f42b98bd7d38593c227
author Xin Li <delphij@google.com> 1599859652 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599859652 +0000

[automerger skipped] Merge Android R am: 7f4c14cc88 -s ours am: db2a369101 -s ours am: decf1c94c4 -s ours am: 8a88e78763 -s ours am: 7971a2d667 -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: I5733b5c7869c8ad3549562c2afaebfbebc0720ff