summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-10-30 16:01:45 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-30 16:01:45 -0700
commit178c0f6ce3cd0461f69dd6451380f19d18e09c0e (patch)
tree8a55290974b826dd1ef81a0bda55a8a23976c0b2
parent975bb1ac310a06e7170f462c44358a0dada3d679 (diff)
parent5c1c45ebedbce6edc86159b4e97d980759552285 (diff)
downloadthermal-178c0f6ce3cd0461f69dd6451380f19d18e09c0e.tar.gz
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 6a8568c80a
am: 5c1c45ebed -s ours am skip reason: subject contains skip directive Change-Id: Ic0dfa389aa76a53f94392f1c57921d0c55356b54
0 files changed, 0 insertions, 0 deletions