commit c57d9a4c249dfc3e2ca6a2a30278518bbfc22d43
author The Android Automerger <android-build@google.com> Wed May 27 01:00:42 2015 -0700
committer The Android Automerger <android-build@google.com> Wed May 27 01:00:42 2015 -0700
tree e728e09ae3961306055638df9dc0fa381e4aa44b
parent 597d244f7aad4217906f036d74973cccbfda93bc
parent 706180cca4782e7f355872a396bbc7759c2a19f2

merge in mnc-release history after reset to mnc-dev

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 6b9b752..0e8e2cf 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=MRZ56B
+export BUILD_ID=MASTER

target/board/generic_x86_64/BoardConfig.mk

diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk
index 55bafd5..5105161 100755
--- a/target/board/generic_x86_64/BoardConfig.mk
+++ b/target/board/generic_x86_64/BoardConfig.mk
@@ -41,7 +41,7 @@
 USE_OPENGL_RENDERER := true
 
 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824 # 1GB
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1342177280  # 1.25 GB
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

tools/droiddoc/templates-sdk/assets/js/docs.js

diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index 92511cc..feaf06b 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -221,7 +221,7 @@
     } else if (urlSegments[2] == "analyze") {
       subNavEl.find("li.analyze > a").addClass("selected");
     } else if (urlSegments[2] == "tools") {
-      subNavEl.find("li.disttools > a").addClass("selected");
+      subNavEl.find("li.essentials > a").addClass("selected");
     } else if (urlSegments[2] == "stories") {
       subNavEl.find("li.stories > a").addClass("selected");
     } else if (urlSegments[2] == "essentials") {