tree d5f4c109941ecb866ddabb30883aa4df08039942
parent 9f4ae3d5482fc2cc6d7d74204ee59f33cfe7cf1d
parent 8af11cffeb3ebe44300ce9066b547d35ab0c6815
author Nick Kralevich <nnk@google.com> 1432736220 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432736220 +0000

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

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