OSDN Git Service

resolved conflicts for merge of 41394a36 to honeycomb-plus-aosp
authorRobert Greenwalt <rgreenwalt@google.com>
Wed, 27 Jul 2011 16:27:00 +0000 (09:27 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Wed, 27 Jul 2011 16:27:00 +0000 (09:27 -0700)
commitaf75fdb16566c3011284afaa7d12bcf6126dd4f3
treecb2545e1c51caf9314b4e092484a75e6db60142f
parentfada80df08dd0b608eeb9737af413f8df1eb5252
parent41394a361020e9f58524f23d6831bb8e63063856
resolved conflicts for merge of 41394a36 to honeycomb-plus-aosp

Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3
core/java/android/os/INetworkManagementService.aidl
services/java/com/android/server/ConnectivityService.java
services/java/com/android/server/NetworkManagementService.java