OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b8c2ea 2c8f0bd)
Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Fri, 2 Sep 2016 13:20:04 +0000 (15:20 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Fri, 2 Sep 2016 13:20:04 +0000 (15:20 +0200)
1  2 
AndroidManifest.xml patch | diff1 | diff2 | blob | history

diff --cc AndroidManifest.xml
Simple merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help