tree 99deb3f12236fe0d31efd60215f2fa0f117fa4d4
parent 49c03e1babca8694e577fe163a3dfa8a78d4ee46
parent 6ca0488c4abe808a1dcbefb55208be50443fe9c6
author Tianjie Xu <xunchang@google.com> 1574120593 -0800
committer android-build-merger <android-build-merger@google.com> 1574120593 -0800

Merge "Clear the warm_reset flag after boot is successful" am: ca18e7fe5a
am: 6ca0488c4a

Change-Id: If68e37558967a323705ba9b229ed64ca553ae21f