diff options
| author | Xin Li <delphij@google.com> | 2019-07-02 16:12:13 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-02 16:12:13 -0700 |
| commit | b1200a38b19a19f625c6a9b1ce89665406e0106c (patch) | |
| tree | 8a55290974b826dd1ef81a0bda55a8a23976c0b2 | |
| parent | 5d9bfb5241ea43b181ba9ec9575fdab861674022 (diff) | |
| parent | e6c6444a0a537a60ddfd815ff03327353d4356bd (diff) | |
| download | thermal-b1200a38b19a19f625c6a9b1ce89665406e0106c.tar.gz | |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 9d22a5e516
am: e6c6444a0a -s ours
am skip reason: subject contains skip directive
Change-Id: I0c4ae7db403560d0808bc828a3b6e7bb4be23a63
0 files changed, 0 insertions, 0 deletions