OSDN Git Service

Fix reboot dialog messages
authorMichael Bestas <mikeioannina@gmail.com>
Sat, 7 Nov 2015 21:52:26 +0000 (23:52 +0200)
committerMichael Bestas <mikeioannina@gmail.com>
Thu, 5 Jan 2017 11:30:12 +0000 (13:30 +0200)
commitd158a808f88b03d6d5e197a12f29e6634cdf8322
tree05c66b01aa0c300ce0c2ca66ecb3a0db83b04ed4
parente385b69094a463df13b81d9c3120857187ba1e75
Fix reboot dialog messages

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

Change-Id: I09a04cc82d48539e8086fd55c30d6160c292bc08
services/core/java/com/android/server/power/ShutdownThread.java