tree a2b1658522ab610bcc269cd9efd30fb1a3a8a71b
parent ca6318675779888c4e8a5bbd47164adf74cdfc89
author Michael Bestas <mikeioannina@gmail.com> 1446933146 +0200
committer Steve Kondik <shade@chemlab.org> 1447244584 -0800

Fix reboot dialog messages

* Fix mismerge
* Fix wrong messages being displayed when rebooting to recovery

Change-Id: I09a04cc82d48539e8086fd55c30d6160c292bc08