OSDN Git Service
(root)
/
android-x86
/
device-generic-common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e210611
0bf4692
)
Merge remote-tracking branch 'x86/pie-x86' into q-x86
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Mon, 6 Apr 2020 04:43:02 +0000
(12:43 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Mon, 6 Apr 2020 04:43:02 +0000
(12:43 +0800)
Conflicts:
CleanSpec.mk
1
2
init.sh
patch
|
diff1
|
diff2
|
blob
|
history
nativebridge/bin/enable_nativebridge
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
init.sh
Simple merge
diff --cc
nativebridge/bin/enable_nativebridge
Simple merge
OSDN Git Service
