summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-03-19 08:24:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-19 08:24:03 +0000
commitf1404fdfe24c3af73c285c5db1ab03d2d292ce5e (patch)
tree00750c90962b670ccafd883daf23c003f95f1850
parent78713762f01e42e647fc6ec2adde628d41bdc265 (diff)
parent30cd40fbfb3b31457b07bd558599d7fe2155fa02 (diff)
downloadktlint-f1404fdfe24c3af73c285c5db1ab03d2d292ce5e.tar.gz
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: af28e03956 -s ours am: 1eeba3ee4a am: 30cd40fbfb
Change-Id: I13f8cc6136ebaf702bcea914cfdb4525b4522fd5
0 files changed, 0 insertions, 0 deletions