OSDN Git Service

am 4bdab175: DO NOT MERGE WiMAX support
authorTK MUN <tk.mun@samsung.com>
Thu, 10 Mar 2011 06:54:44 +0000 (22:54 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Mar 2011 06:54:44 +0000 (22:54 -0800)
commitc01fd043a92462f12210d45a92d751b49e0e1f62
treef865d0f75405aa5c95a738975beee39d1ddbe9d0
parenta15b5290f5785031ec4813fd7e141a9fc39c18fa
parent4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7
am 4bdab175: DO NOT MERGE WiMAX support

* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
  DO NOT MERGE WiMAX support
core/java/android/net/ConnectivityManager.java
core/java/android/net/NetworkUtils.java
core/java/android/provider/Settings.java
core/jni/android_net_NetUtils.cpp
core/res/res/values/config.xml
core/res/res/values/strings.xml
services/java/com/android/server/ConnectivityService.java