resolved conflicts for merge of 68000907 to lmp-mr1-dev

Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47
This commit is contained in:
Justin Morey 2015-03-18 21:27:17 -05:00
commit 030b549314
1 changed files with 1 additions and 1 deletions

View File

@ -41,7 +41,7 @@ BUILD_EMULATOR_OPENGL := true
USE_OPENGL_RENDERER := true
TARGET_USERIMAGES_USE_EXT4 := true
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824 # 1GB
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824 # 1GB
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4