tree f4f390f7d6b8421e32863e3b2e64461650c628dc
parent 0b1d15742f4cc7f930981fc63ee74b5df51ce719
parent b48bdbeda03af04ec8e0d52f6af680a9062eb916
author Nick Kralevich <nnk@google.com> 1432732750 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432732750 +0000

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

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