diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-29 23:29:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-29 23:29:13 +0000 |
commit | 239ed11ed57774f8994e80d65f160f0af0dabc4c (patch) | |
tree | cf47ba0d37afc0686836e3c30447c7508fe2d04c /scripts/update_payload/test_utils.py | |
parent | af4382b2fc5bae7fdf7d92c056d5548f13b8bfd6 (diff) | |
parent | 9a43fe2f946cbcb12bc233a5cda306910b27458e (diff) |
Merge "Merge remote-tracking branch 'remotes/aosp/upstream-master' into merge-cros" am: 336c2123e8 am: 16647c9f05 am: 9a43fe2f94
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1479157
Change-Id: I3ba3f7592c718ae87b7403f434f406b3b91f1a2b
Diffstat (limited to 'scripts/update_payload/test_utils.py')
0 files changed, 0 insertions, 0 deletions