tree 6991a258b0867fcd0c6af1e7717731bd1f403926
parent b571f30e8f2ab201d7d0e075f0bba327c6cc90d7
parent b0c3c15639187d51572a0b077c117fa8e47631aa
author Tao Bao <tbao@google.com> 1556577060 -0700
committer android-build-merger <android-build-merger@google.com> 1556577060 -0700

Merge "Consolidate the codes that handle reboot/shutdown." am: 189c8f9aeb am: 3486372d69
am: b0c3c15639

Change-Id: I6b4f183faf15862c940e73cac08e0bb0c317d838