diff options
author | Xin Li <delphij@google.com> | 2019-02-24 02:28:40 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-24 02:28:40 -0800 |
commit | 5fe85c703caf021b240f9c2780fbbbb6e831e060 (patch) | |
tree | 3ee17946ae96488a8527747c5a252bf1b409eada | |
parent | 2ae8b35bb4c07a00ad178183667b23a4face2fad (diff) | |
parent | 6a84f985968693a5c5d591fe9eea847bbb057ca2 (diff) | |
download | thermal-5fe85c703caf021b240f9c2780fbbbb6e831e060.tar.gz |
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 6a84f98596 -s ours
am skip reason: subject contains skip directive
Change-Id: I250939101c066f55561ec48d948bb382d14b4492
0 files changed, 0 insertions, 0 deletions