OSDN Git Service

resolved conflicts for merge of 8de47a2f to honeycomb-LTE
authorRobert Greenwalt <rgreenwalt@google.com>
Tue, 7 Jun 2011 19:45:41 +0000 (12:45 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Tue, 7 Jun 2011 19:45:41 +0000 (12:45 -0700)
commit5df69fad6e5021d2862bff0553a510f8d6729fbd
tree61eab9273e80276b65498c6f1f987574ff75b62d
parent212d15c746f2611339026c16e5fa1aeb7f9090b7
parent8de47a2f25a9379c44f220f0bd0f25585bfbc9fb
resolved conflicts for merge of 8de47a2f to honeycomb-LTE

Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
core/java/android/net/ConnectivityManager.java
telephony/java/android/telephony/TelephonyManager.java