OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
934da4e
c5a17fc
)
Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4
author
Tao Bao
<tbao@google.com>
Mon, 29 Aug 2016 19:34:23 +0000
(19:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 29 Aug 2016 19:34:23 +0000
(19:34 +0000)
am:
c5a17fc39f
Change-Id: Ib637e1f00ddebbac5a3bea6ff31f08854a95b7ea
1
2
services/core/java/com/android/server/power/ShutdownThread.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/power/ShutdownThread.java
Simple merge
OSDN Git Service
