OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Fix flaky tests in OverheatAlarm feature...
authorBill Lin <lbill@google.com>
Fri, 22 Feb 2019 12:49:11 +0000 (04:49 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Feb 2019 12:49:11 +0000 (04:49 -0800)
commit9646e08b3f6d8f95ee076f7634d5cb886d63b4b1
tree7e2d4665bc1168117d5114813ad1bec9c2b8e58f
parent2c0a9bd122c576929f1aebdab8d3bce8ecf82640
parent6d19f33ca61764f77908d1f41bc470e4e3c085ce
[automerger skipped] Merge "DO NOT MERGE Fix flaky tests in OverheatAlarm feature" into pi-dev
am: 6d19f33ca6 -s ours
am skip reason: SHA1 6d19f33ca6 skipped by user lbill

Change-Id: I806bc8dd36c81ad3ffa1cd52dc91d929fde5ab81