Merge tag 'android-7.1.2_r39' into nougat-x86

author Chih-Wei Huang <cwhuang@linux.org.tw>

Wed, 16 Oct 2019 14:30:17 +0000 (22:30 +0800)

committer Chih-Wei Huang <cwhuang@linux.org.tw>

Wed, 16 Oct 2019 14:30:17 +0000 (22:30 +0800)
author Chih-Wei Huang <cwhuang@linux.org.tw>
Wed, 16 Oct 2019 14:30:17 +0000 (22:30 +0800)
committer Chih-Wei Huang <cwhuang@linux.org.tw>
Wed, 16 Oct 2019 14:30:17 +0000 (22:30 +0800)
diff --cc device/src/controller.c
Simple merge
diff --cc osi/src/alarm.c
Simple merge
author	Chih-Wei Huang <cwhuang@linux.org.tw>
	Wed, 16 Oct 2019 14:30:17 +0000 (22:30 +0800)
committer	Chih-Wei Huang <cwhuang@linux.org.tw>
	Wed, 16 Oct 2019 14:30:17 +0000 (22:30 +0800)
		1	2
device/src/controller.c	patch \|	diff1 \|	diff2 \|	blob \| history
osi/src/alarm.c	patch \|	diff1 \|	diff2 \|	blob \| history