am 292427b6: am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev

* commit '292427b69f7b1a753c0636f916382e2a4f9648ba':
  Bump generic_x86_64 system partition size - DO NOT MERGE
This commit is contained in:
Justin Morey 2015-03-19 03:00:29 +00:00 committed by Android Git Automerger
commit abd5bbc4fe

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