OSDN Git Service

Merge 6b739dc7 from gingerbread
authorJean-Baptiste Queru <jbq@google.com>
Sat, 29 Jan 2011 20:59:11 +0000 (12:59 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 29 Jan 2011 20:59:20 +0000 (12:59 -0800)
commit7ea919c44b05daf99c045d09eb3edafb96019da7
tree22f0f16e78529bcf11773b4f22a37fbcd458a4d6
parent5f3ba16de02de7e36b11117d455e1c64e231cd3f
parent6b739dc7292452227cdd8abd90658f4db8f0ce70
Merge 6b739dc7 from gingerbread

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