tree d5f4c109941ecb866ddabb30883aa4df08039942
parent 6d1d7ffa051a3aaba40c9ca2ea7d68c0465e0a52
parent 41928ce61da9b4e328f361f8295f83bd1149d430
author Nick Kralevich <nnk@google.com> 1432734516 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432734516 +0000

am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo""

* commit '41928ce61da9b4e328f361f8295f83bd1149d430':
  Revert "recovery: change the way of rebooting when using power key combo"