summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-02-24 02:06:52 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-24 02:06:52 -0800
commitd836a486986f646b517ea08dbab4ecb04a5663a9 (patch)
tree3031abba104d5e5d2abef673cbe513770d2001c3
parenta913e81be50785083679552c2c0482dd0dc5a745 (diff)
parentddaa13e7fb7329c7e7682580cf8dd2379daebc12 (diff)
downloadktlint-d836a486986f646b517ea08dbab4ecb04a5663a9.tar.gz
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: ddaa13e7fb -s ours am skip reason: subject contains skip directive Change-Id: I2c178b8273b877b87b951736c23a554d1f3f7f4a
0 files changed, 0 insertions, 0 deletions