OSDN Git Service

(root) / android-x86 / system-netd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19f0e13 d2c6535)
am d2c65351: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:32:39 +0000 (08:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Aug 2012 15:32:39 +0000 (08:32 -0700)
* commit 'd2c653514cd77fc8ce73c4da40ac9e2a9d4a74f5':


Trivial merge
system/netd
About OSDN
Find Software
Develop Software
Help