OSDN Git Service

Merge "Reduce the timeout for waiting for the network state update." into oc-dev
authorSudheer Shanka <sudheersai@google.com>
Thu, 4 May 2017 00:35:03 +0000 (00:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 May 2017 00:35:03 +0000 (00:35 +0000)
commita2ebd80d84e2ec240c51b2cba613dae8917452c9
tree55e1dd660f5119a3d712d0abfdd43ee7ce50d613
parent257a070939f7b8d8fa8c1554db47d8fbb2da994c
parentf345a436be4fcad491c39a29598854e7079f5e2b
Merge "Reduce the timeout for waiting for the network state update." into oc-dev
am: f345a436be

Change-Id: I62dcd82ec7dc1ef4b3fb9ab2c332f18581b7425d
services/core/java/com/android/server/am/ActivityManagerService.java