merge in klp-release (no-op)
diff --git a/core/build_id.mk b/core/build_id.mk
index 764b34f..64ad133 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,6 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-export BUILD_ID=KRT15D
+BUILD_ID := KK
+
+DISPLAY_BUILD_NUMBER := true
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index dbc8410..fa9dee3 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -4364,7 +4364,6 @@
.jspPane {
position: absolute;
- overflow: hidden;
width:100% !important; /* to avoid cut-off api names in reference in horiz scroll */
}