commit 71a33c4d5b010757423980b90681445ca2bb2be0
author Clay Murphy <claym@google.com> Tue Aug 11 20:55:24 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 11 20:55:24 2015 +0000
tree 54587f9f310151437a4ca83559e160f97ab8dfac
parent 073f74d90853b39de32308fa3eeab9aa8998bd69
parent a76428792fedb33d0a67ea52f0300677cee103a5

Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index e88623e..efb2bee 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -80,7 +80,7 @@
     # assuming the device can only support APIs as of the previous official
     # public release.
     # This value will always be 0 for release builds.
-    PLATFORM_PREVIEW_SDK_VERSION := 3
+    PLATFORM_PREVIEW_SDK_VERSION := 0
   endif
 endif
 

target/board/generic_x86/BoardConfig.mk

diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk
index d5f0531..0b8e1cd 100644
--- a/target/board/generic_x86/BoardConfig.mk
+++ b/target/board/generic_x86/BoardConfig.mk
@@ -35,7 +35,7 @@
 USE_OPENGL_RENDERER := true
 
 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 786432000
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1342177280  # 1.25 GB
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4