OSDN Git Service

Merge remote-tracking branch 'origin/master' into oreo-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 2 Nov 2018 07:56:54 +0000 (15:56 +0800)
committerChih-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

diff --cc Android.mk
Simple merge