aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-10-30 14:22:09 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-30 14:22:09 -0700
commit869327c346e6ba5c91898cd26a693a16a49a806a (patch)
tree12d2cef37c3c813e5b9e9505ef5e6c774ae0742f
parentd15fe0d0cf5535325ee4f0ce54b7fa3a7d2b576f (diff)
parent937ad27e1894565c795f0d20ed17521aecba1d49 (diff)
downloadokhttp-869327c346e6ba5c91898cd26a693a16a49a806a.tar.gz
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 5c1feaf419
am: 937ad27e18 -s ours am skip reason: subject contains skip directive Change-Id: I50a3e89b430c702a8a85e8f4c8d3f823dd6b26db
0 files changed, 0 insertions, 0 deletions