summaryrefslogtreecommitdiff
path: root/scripts/update_payload/format_utils.py
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-10-30 16:43:18 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-30 16:43:18 -0700
commit0b5d3e18f5c818e13e151d12919844678ef90051 (patch)
treeabcf9de3da55e29685188b1ce0701b8dcb15010a /scripts/update_payload/format_utils.py
parent774c80594b2f5729912a7cc02507396e64cafe9a (diff)
parentbe6aad65384324757ad83ab94b20e404ed73ef85 (diff)
[automerger skipped] Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master am: e1ed866be3
am: be6aad6538 -s ours am skip reason: subject contains skip directive Change-Id: Ib7a417910d1dc4a63b79cb58a8711e3cacf34265
Diffstat (limited to 'scripts/update_payload/format_utils.py')
0 files changed, 0 insertions, 0 deletions