resolve merge conflicts of b5775d97b4 to master.

Change-Id: I99fda2935ab74e0634c1aa4905ce4da693e96cb6
This commit is contained in:
Chih-Hung Hsieh 2015-10-27 16:48:38 -07:00
commit 07be5025d9
1 changed files with 2 additions and 0 deletions

View File

@ -76,3 +76,5 @@ BOARD_FLASH_BLOCK_SIZE := 512
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
USE_CLANG_PLATFORM_BUILD := true