merge in klp-release history after reset to klp-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index 16759fd..a3b9db6 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=KRT14B
+BUILD_ID := KLP
+
+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 0120144..dbc8410 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -472,6 +472,10 @@
height: 10px;
display: inline-block;
margin-left: 5px; }
+ .prev-page-link.inline:before {
+ content: none; }
+ .next-page-link.inline:after {
+ content: none; }
.training-nav-top a {
@@ -2656,7 +2660,7 @@
font-size: 11.5px;
}
-.nolist {
+.nolist, .nolist ul, .nolist ol {
list-style:none;
margin-left:0;
}