OSDN Git Service

Merge "Log the error when uncrypt timeouts" am: c1973ecbd2 am: c68e6d6708
authorTianjie Xu <xunchang@google.com>
Wed, 28 Sep 2016 20:05:15 +0000 (20:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Sep 2016 20:05:15 +0000 (20:05 +0000)
commit96ce9d16ed84d2f50cafbf74dfd30d88271aa60b
treed424c864ae620f42bfaae9f663318d545bd6f4c2
parentf3dba3b5f9f2addd03333abfa3c7625a9318a8ce
parent3aeade44a9175ebea3170aced45db15d0d448b14
Merge "Log the error when uncrypt timeouts" am: c1973ecbd2 am: c68e6d6708
am: 3aeade44a9

Change-Id: I913474dbf87b30683267d8f6a458927b7d331c4c
core/java/android/os/RecoverySystem.java
services/core/java/com/android/server/power/ShutdownThread.java