aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-04-10 03:19:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-10 03:19:21 +0000
commitc7a397e4d1d045629186374da097c7b828e639cb (patch)
tree2946a6b1a43029d25b7aaff4d2bd2fd2cb4a8305
parent55e8120077c04986ead3deab52a52c0908178673 (diff)
parent66ff678f1784cf9abea003880c5a2ab4fdc50910 (diff)
downloadsetuptools-c7a397e4d1d045629186374da097c7b828e639cb.tar.gz
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 66ff678f17 -s ours
am skip reason: subject contains skip directive Change-Id: I61817b5a9cb77f1c80a81c3d5cd59215ced70b5d
0 files changed, 0 insertions, 0 deletions