OSDN Git Service

(root) / android-x86 / system-netd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d377572 a3103f9)
am a3103f9f: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:18:46 +0000 (10:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Sep 2012 17:18:46 +0000 (10:18 -0700)
* commit 'a3103f9fe060e91fd6de0975ebe31ddeed88a9e4':


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