OSDN Git Service

am d5ee4144: Merge "Increase start timeout for wrapped process"
authorDmitriy Ivanov <dimitry@google.com>
Fri, 23 May 2014 02:35:42 +0000 (02:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 23 May 2014 02:35:42 +0000 (02:35 +0000)
commit2137d6a843b82996e08f0e03376e48860919d8bc
tree0d15e1fca1c4f8a84e3064ce58b5cddbb718d310
parentd6d7587ab09e4a0eae9252e11ab59ad27af68823
parentd5ee4144c4beae54219e1b8eb10418b02dd4a63b
am d5ee4144: Merge "Increase start timeout for wrapped process"

* commit 'd5ee4144c4beae54219e1b8eb10418b02dd4a63b':
  Increase start timeout for wrapped process
services/java/com/android/server/am/ActivityManagerService.java