OSDN Git Service

am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1...
authorDianne Hackborn <hackbod@google.com>
Thu, 20 Aug 2015 02:04:10 +0000 (02:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 02:04:10 +0000 (02:04 +0000)
commit0171f3829cf8b9257a77fca49b8326287c76b286
tree8a06618d44636809b39f44473bb455fa1446fbf9
parent746aee22e872581607fc1bc9a6425ba924e73393
parentc14cbac4a3e76d924621b34367cc8b6bcf977908
am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev

* commit 'c14cbac4a3e76d924621b34367cc8b6bcf977908':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second
services/core/java/com/android/server/am/ActivityManagerService.java