OSDN Git Service

(root) / android-x86 / system-extras.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 538cae8 eb790ea)
Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86 cm-13.0-x86
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Mon, 8 Aug 2016 14:51:42 +0000 (16:51 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Mon, 8 Aug 2016 14:51:42 +0000 (16:51 +0200)
Conflicts:
ext4_utils/mkuserimg.sh


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