OSDN Git Service

resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 15 Jul 2011 16:55:48 +0000 (09:55 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Fri, 15 Jul 2011 16:55:48 +0000 (09:55 -0700)
commit8550f3b86aabe04e149866839bde78b335cc1104
tree209b8aea063a70a161d790b227cbaec4ba83ac1e
parent74c425d3e95ed0f47b1a5d447007886d01d7ff56
parent0a46db5d88461d9a6c85bb2e95982ac4c511d57e
resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp

Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
services/java/com/android/server/ConnectivityService.java