tree 3f7fb1b3c77415a7a9ebfa80eb8eb39baa816250
parent 7088c5a1134c228faa8b1bf7d30a70c5c26b4eb6
parent a57116554e71c0bb6d51efd1238269f029c09ea0
author Xin Li <delphij@google.com> 1599784861 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784861 +0000

[automerger skipped] Merge Android R am: a57116554e -s ours

am skip reason: Change-Id Ie7cb70566695de61c3605b1b279dff6b65275601 with SHA-1 7088c5a113 is in history

Original change: https://android-review.googlesource.com/c/platform/external/libbackup/+/1422371

Change-Id: Ib2a7949b672873b706d7c8963103005336660f12