summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2014-03-27 20:13:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-27 20:13:59 +0000
commit7b190e0f1df16346696465c0114179b423afc26d (patch)
tree4fd8b65fff02d6f56a15c723adbdc94148086aec
parent4243710bf8b4bf3a0bec9c4cf3b00e4b69651883 (diff)
parent22b483ee6e029dc9db4ae390b91c449b7977273d (diff)
downloadframeworks_base-7b190e0f1df16346696465c0114179b423afc26d.zip
frameworks_base-7b190e0f1df16346696465c0114179b423afc26d.tar.gz
frameworks_base-7b190e0f1df16346696465c0114179b423afc26d.tar.bz2
am 22b483ee: am bbaf11f4: update viewport variable with new underscore format
* commit '22b483ee6e029dc9db4ae390b91c449b7977273d': update viewport variable with new underscore format
-rw-r--r--docs/html/design/index.jd2
-rw-r--r--docs/html/develop/index.jd2
-rw-r--r--docs/html/distribute/index.jd2
-rw-r--r--docs/html/index.jd2
-rw-r--r--docs/html/wear/index.jd2
5 files changed, 5 insertions, 5 deletions
diff --git a/docs/html/design/index.jd b/docs/html/design/index.jd
index c687f33..7c7c5d9 100644
--- a/docs/html/design/index.jd
+++ b/docs/html/design/index.jd
@@ -1,5 +1,5 @@
page.title=Design
-page.viewport-width=970
+page.viewport_width=970
header.hide=1
footer.hide=1
@jd:body
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index 083b428..eb28da8 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -1,6 +1,6 @@
fullpage=true
page.title=Develop
-page.viewport-width=970
+page.viewport_width=970
header.hide=1
carousel=1
tabbedList=1
diff --git a/docs/html/distribute/index.jd b/docs/html/distribute/index.jd
index d2534b9..6c6e113 100644
--- a/docs/html/distribute/index.jd
+++ b/docs/html/distribute/index.jd
@@ -1,5 +1,5 @@
page.title=Distribute Apps
-page.viewport-width=970
+page.viewport_width=970
header.hide=1
@jd:body
diff --git a/docs/html/index.jd b/docs/html/index.jd
index d645246..99a469a 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -1,5 +1,5 @@
fullpage=true
-page.viewport-width=970
+page.viewport_width=970
no_footer_links=true
carousel=true
excludeFromSuggestions=true
diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd
index b977554..a6a6460 100644
--- a/docs/html/wear/index.jd
+++ b/docs/html/wear/index.jd
@@ -1,5 +1,5 @@
page.title=Android Wear
-page.viewport-width=970
+page.viewport_width=970
fullpage=true
no_footer_links=true
page.customHeadTag=<link rel="stylesheet" type="text/css" href="/wear/css/wear.css">