OSDN Git Service

Merge 37dbfcaf
authorJean-Baptiste Queru <jbq@google.com>
Thu, 7 Jul 2011 15:46:09 +0000 (08:46 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 7 Jul 2011 15:46:09 +0000 (08:46 -0700)
commitd5299ff39aa7532c0213978fc0a95e08c3a77deb
tree27f1c59dc49b2057d261b38d6109a5beca295c34
parent1a65b441b127e66c0fae2e04e6f88628a6363209
parent37dbfcaf836cf37d1e404cd2cf25f4ed670bc80f
Merge 37dbfcaf

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