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)
commit5ddecb14af4da0dda3f3817be23f1b3c54514aec
tree20aff811fcc5e7547148708f277513aa1e12722c
parent2f728292e676b48584c75cc1f46f4c5a35b5eb99
parent137cc39aaa57f8c64db3397cd6ec7600a191a88d
Merge remote-tracking branch 'origin/master' into oreo-x86

Conflicts:
gralloc_drm_handle.h
Android.mk