Merge remote-tracking branch 'aosp/android-msm-flo-3.4-marshmallow' into exp
Dennis Rassmann authored
Signed-off-by: Dennis Rassmann's avatarDennis Rassmann <showp1984@gmail.com>

Conflicts:
	arch/arm/configs/flo_defconfig
	build.config
5e33fa14