OSDN Git Service

(root) / android-x86 / external-wpa_supplicant_8.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cc49e8 7298e5a)
am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:00:55 +0000 (13:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:00:55 +0000 (13:00 -0700)
* commit '7298e5ab20b37767cab89e7bc5784eb99d46a749':


Trivial merge
external/wpa_supplicant_8
About OSDN
Find Software
Develop Software
Help