OSDN Git Service

(root) / android-x86 / system-netd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d67cc36 42b4c50)
am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:47:28 +0000 (12:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:47:28 +0000 (12:47 -0700)
* commit '42b4c5083b168c6780b95e5c60b49655b049d56f':


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