commit | b665931af071b11855796606cfb817ac7b6f52d8 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:30 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:30 2020 +0000 |
tree | 3f7fb1b3c77415a7a9ebfa80eb8eb39baa816250 | |
parent | eaf7265601fc8f5a870338c175a3b60a6b9e3cd9 [diff] | |
parent | 108cb5e0edb4fb7f91650745a6babbd7998c05e7 [diff] |
[automerger skipped] Merge Android R am: a57116554e -s ours am: a33524fe17 -s ours am: e3c6e55b37 -s ours am: 108cb5e0ed -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: I32a77fa7057209a3170c398f06b1c57beda03c49