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:
d6d7587
d5ee414
)
am d5ee4144: Merge "Increase start timeout for wrapped process"
author
Dmitriy Ivanov
<dimitry@google.com>
Fri, 23 May 2014 02:35:42 +0000
(
02:35
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 23 May 2014 02:35:42 +0000
(
02:35
+0000)
* commit '
d5ee4144c4beae54219e1b8eb10418b02dd4a63b
':
Increase start timeout for wrapped process
1
2
services/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/java/com/android/server/am/ActivityManagerService.java
Simple merge
OSDN Git Service
