OSDN Git Service

Merge remote-tracking branch 'origin/master' into oreo-x86 nougat-x86 oreo-x86 android-x86-7.1-r4 android-x86-7.1-r5 android-x86-8.1-r1 android-x86-8.1-r2 android-x86-8.1-r3 android-x86-8.1-r4 android-x86-8.1-r5 android-x86-8.1-r6
authorChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 2 Nov 2018 07:58:42 +0000 (15:58 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 2 Nov 2018 07:58:42 +0000 (15:58 +0800)
commitc1281eaa0b40f257ce3f99c06129f9251edeb2ec
treed259a61449dea57d8599e9d10b6b946f98e9ffb9
parent792fa3e7ebbeef2817f9c20ea4fc692ae1ae7f67
parentf268ccf5f439b642cc4f94abde4b1a376a8b1ed4
Merge remote-tracking branch 'origin/master' into oreo-x86

Conflicts:
Android.mk
drmconnector.cpp
drmeventlistener.cpp
Android.mk
drmconnector.cpp
drmdisplaycomposition.cpp
drmdisplaycompositor.cpp
drmdisplaycompositor.h
drmeventlistener.cpp
drmhwctwo.cpp
drmresources.cpp
hwcomposer.cpp