diff options
author | Xin Li <delphij@google.com> | 2019-09-05 13:23:17 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-05 13:23:17 -0700 |
commit | 07e8cd03d8711a405aa5b7997bc23c3daa734db5 (patch) | |
tree | 8a55290974b826dd1ef81a0bda55a8a23976c0b2 | |
parent | 9d22a5e516b214b78be82510741ca0f45f2a00ad (diff) | |
parent | a559c4d21a4a0207adc961b6536ab0811cd96333 (diff) | |
download | thermal-07e8cd03d8711a405aa5b7997bc23c3daa734db5.tar.gz |
[automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: a559c4d21a -s ours
am skip reason: subject contains skip directive
Change-Id: I7a16b133a809ad173e158d286719130f127e5854
0 files changed, 0 insertions, 0 deletions