OSDN Git Service

Merge changes I31d5260d,Ied92f558 into nyc-dev
authorRobin Lee <rgl@google.com>
Wed, 4 May 2016 18:35:17 +0000 (18:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 May 2016 18:35:19 +0000 (18:35 +0000)
commita5e6553917359bb662c8f2788feb3d617803d406
treea203469e2ec0f48822f4b086341b3917a104ddbc
parenta75f01557cb3299de69ae856a06e824535de6e39
parent323f29df583e9338e3b2bf90fc8c0785a934a61b
Merge changes I31d5260d,Ied92f558 into nyc-dev

* changes:
  Start VPN as early as possible during startup
  Split network agent created state from connected state
services/core/java/com/android/server/ConnectivityService.java