OSDN Git Service
(root)
/
android-x86
/
external-gbm_gralloc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2f72829
137cc39
)
Merge remote-tracking branch 'origin/master' into oreo-x86
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Fri, 2 Nov 2018 07:56:54 +0000
(15:56 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Fri, 2 Nov 2018 07:56:54 +0000
(15:56 +0800)
Conflicts:
gralloc_drm_handle.h
1
2
Android.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Android.mk
Simple merge