commit aa809c64767a2a8e34d333550dd981de19802ffb
author Pekka Pesu <pekka.pesu@nedevicesw.com> Tue Nov 08 17:34:28 2016 +0200
committer Pekka Pesu <pekka.pesu@nedevicesw.com> Tue Nov 08 17:34:28 2016 +0200
tree be92740709db5bbecf51b5e2a9b6ce88645f3b53
parent 7d2adc35606c56036f32b4d1c3996183ae927be5
parent db479267874f5ff09da374325a16d14c3d42a89b

Merge commit 'db479267874f5ff09da374325a16d14c3d42a89b' into FPIIM_WIP

Conflicts:
	AndroidBoot.mk
	app/aboot/aboot.c

Change-Id: I9de2270b8fc1b50883241042db9361166d6ddb64

AndroidBoot.mk

diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index 2ebb180..7560a70 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -28,9 +28,9 @@
 endif
 
 ifeq ($(TARGET_BOARD_PLATFORM),msm8660)
-  BOOTLOADER_PLATFORM := msm8660_surf
+	BOOTLOADER_PLATFORM := msm8660_surf
 else
-  BOOTLOADER_PLATFORM := $(TARGET_BOARD_PLATFORM)
+	BOOTLOADER_PLATFORM := $(TARGET_BOARD_PLATFORM)
 endif
 
 ABOOT_OUT := $(TARGET_OUT_INTERMEDIATES)/ABOOT_OBJ