summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-04-10 04:05:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-10 04:05:30 +0000
commit2861df7cb78f2fe00dd632d08ca4736f3ee7b342 (patch)
tree8cbf62a905a2be8ffceeb6d79dadaa0e7d0d3837
parenta92237a03871c617e2f8246492b12119b743ecdf (diff)
parentd7f3df2fe84773b5de5adab376060fa796acc6b3 (diff)
downloadthermal-2861df7cb78f2fe00dd632d08ca4736f3ee7b342.tar.gz
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 3a2c4cfa8b -s ours am: 00bdb4cbbb am: d7f3df2fe8
Change-Id: I0a2ac9b84ce926afbc6762328793e9efa4eb5b1c
0 files changed, 0 insertions, 0 deletions