tree f4f390f7d6b8421e32863e3b2e64461650c628dc
parent 9e9cbc9bbc9e87be3b83a471c02dbd21396fb484
parent 6d1d7ffa051a3aaba40c9ca2ea7d68c0465e0a52
author Nick Kralevich <nnk@google.com> 1432733572 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432733572 +0000

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

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