diff options
author | Xin Li <delphij@google.com> | 2020-09-11 02:02:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 02:02:39 +0000 |
commit | 2f43e56e1e151381e91eb1e8672dc64c1bc9826e (patch) | |
tree | e286d0861431bd97e23d171f456c343fc3ae980e /scripts/update_payload/format_utils_unittest.py | |
parent | 749dbef88b905cb6da84d7b33b4411a8d844fd9e (diff) | |
parent | 1a657cd147f0ffc7d3e10c7afd17e97b81967e79 (diff) |
[automerger skipped] Merge Android R am: 0870f9d7e8 -s ours am: 1a657cd147 -s ours
am skip reason: Change-Id Ida5549b52c29abc2a7305c32dccc955d331937c2 with SHA-1 443bd55ac2 is in history
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1422562
Change-Id: Ie161047186da265b59c7a0458ffae384ed838a2a
Diffstat (limited to 'scripts/update_payload/format_utils_unittest.py')
0 files changed, 0 insertions, 0 deletions