diff options
author | Xin Li <delphij@google.com> | 2019-09-08 17:35:00 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-08 17:35:00 -0700 |
commit | 975bb1ac310a06e7170f462c44358a0dada3d679 (patch) | |
tree | 8a55290974b826dd1ef81a0bda55a8a23976c0b2 | |
parent | cbf6d4420e26d0ad6a9f3fa6bfd4c346d7d7df8d (diff) | |
parent | 97fa980e9dfaa5f5137990918a7ff18594fac5ad (diff) | |
download | thermal-975bb1ac310a06e7170f462c44358a0dada3d679.tar.gz |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: aa3afd9fa8 -s ours am: 84312b6396 -s ours
am: 97fa980e9d -s ours
am skip reason: change_id I8c96c0c822f50b12b9f703bef0e64142e3b14bc8 with SHA1 a559c4d21a is in history
Change-Id: I4140f8c28d2ee8787b9e8e87ba7b6903088711e9
0 files changed, 0 insertions, 0 deletions