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