OSDN Git Service

Merge "Log the error when uncrypt timeouts" am: c1973ecbd2 am: c68e6d6708 am: 3aeade44a9
authorTianjie Xu <xunchang@google.com>
Wed, 28 Sep 2016 20:10:46 +0000 (20:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Sep 2016 20:10:46 +0000 (20:10 +0000)
commit0939ddf6f30d6e52e360222ce56a0e7fd56ff5e9
tree3ff47e9f82196fd0a2b66966d7e569ad267e9c2c
parentae57023647d971c997d7ef1852770c09bd8eef9c
parent96ce9d16ed84d2f50cafbf74dfd30d88271aa60b
Merge "Log the error when uncrypt timeouts" am: c1973ecbd2 am: c68e6d6708 am: 3aeade44a9
am: 96ce9d16ed

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