OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c65708e 47a2573)
resolved conflicts for merge of 47a2573e to master
authorRobert Greenwalt <robdroid@android.com>
Tue, 8 Dec 2009 21:30:56 +0000 (13:30 -0800)
committerRobert Greenwalt <robdroid@android.com>
Tue, 8 Dec 2009 21:30:56 +0000 (13:30 -0800)
commita1b04c01ca130201060cd78b47efcc2c1aa6f5c6
tree9e31bb0d2eb45aa444fc1e370b0583caef835825tree | snapshot
parentc65708ef6edcc76138485095cf9c6cbe48b2bf1ccommit | diff
parent47a2573e5463a1bac0f856a52ad7a8bce15a631ecommit | diff
resolved conflicts for merge of 47a2573e to master
services/java/com/android/server/ConnectivityService.java diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help