tree f4f390f7d6b8421e32863e3b2e64461650c628dc
parent 1a0fb83d705b4866c5adee223f3ab49a22f3a333
parent f0e2927d7c534693bb06a675fde08f2fdf423669
author Nick Kralevich <nnk@google.com> 1432734037 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432734037 +0000

am f0e2927d: am 6d1d7ffa: am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo"

* commit 'f0e2927d7c534693bb06a675fde08f2fdf423669':
  recovery: change the way of rebooting when using power key combo