summaryrefslogtreecommitdiff
path: root/scripts/update_payload/format_utils_unittest.py
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2020-11-04 19:40:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-04 19:40:06 +0000
commit93a08911fbc16d0e6c5b90f5a2a96be1573ba487 (patch)
tree356455b07ab5c83123f3cafbc5685be0de67655b /scripts/update_payload/format_utils_unittest.py
parentab80ad1c0dda0b78ec491c68ebc65fdce58504a3 (diff)
parent82a90114ac1f14016ce71fa47264cae8ce1a98a6 (diff)
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge" am: 30b09d0c5a am: e23e062b23 am: 82a90114ac
Original change: undetermined Change-Id: I508db49bff0984613ae75f21c7061d4cfe50298c
Diffstat (limited to 'scripts/update_payload/format_utils_unittest.py')
0 files changed, 0 insertions, 0 deletions