OSDN Git Service

(root) / android-x86 / external-koush-Superuser.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0bfdbc 9e683de)
Merge remote-tracking branch 'koush/master' into cm-11.0
authorKoushik Dutta <koushd@gmail.com>
Mon, 10 Feb 2014 17:02:39 +0000 (09:02 -0800)
committerKoushik Dutta <koushd@gmail.com>
Mon, 10 Feb 2014 17:02:39 +0000 (09:02 -0800)
Conflicts:
Superuser/AndroidManifest.xml

Change-Id: Ic4c9b674efb040b51a36472cabcd6234a5f382b2


Trivial merge
external/koush/Superuser
About OSDN
Find Software
Develop Software
Help