OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0894498 9052864)
resolved conflicts for merge of 90528645 to master
authorRobert Greenwalt <robdroid@android.com>
Fri, 15 Jan 2010 18:45:11 +0000 (10:45 -0800)
committerRobert Greenwalt <robdroid@android.com>
Fri, 15 Jan 2010 18:45:11 +0000 (10:45 -0800)
commit40bbaaac5f0b93de8d8b8164ac8b59583bc0113a
treeb3eb1bf2b147b408e4a712a35412a90f99d3866btree | snapshot
parent0894498712de1f15b6491fa5fe111b2da7fb7038commit | diff
parent90528645ad7d40634737075dc49a9f60bc7a1748commit | diff
resolved conflicts for merge of 90528645 to master
services/java/com/android/server/ConnectivityService.java diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help