Skip to content
Commit d5e42b65 authored by Sherry Huang's avatar Sherry Huang Committed by android-build-merger
Browse files

Merge "Merge "Only show the thermal shutdown warning when thermal reboot" into... 

Merge "Merge "Only show the thermal shutdown warning when thermal reboot" into qt-r1-dev am: 553b8bf2 am: d9baadcf" into qt-qpr1-dev-plus-aosp
am: 23eaeb88

Change-Id: Id5dd60d462fff10deecefd6dbf709fb463a7784a
parents ff59a09b 23eaeb88
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment