summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Trevor Johns <trevorjohns@google.com> 2014-10-23 16:51:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-10-23 16:51:39 +0000
commitfb28bd158dd387225bb55e31da60101436e7b13c (patch)
treeb5282442c30330e10b63f62acb6c884fc27959e0
parent8755d9a5361d716433505e883986e8bf5f28d041 (diff)
parentabcb138da8db27ff64da92bd29a9a12556db40db (diff)
Merge "Docs: Add TOC page for Wearable samples" into lmp-dev
-rw-r--r--Android.mk3
-rw-r--r--docs/html/samples/wearable.jd11
2 files changed, 13 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 22cc27b6be87..b77c2edc15b9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -737,7 +737,8 @@ sample_groups := -samplegroup Background \
-samplegroup Sensors \
-samplegroup Testing \
-samplegroup UI \
- -samplegroup Views
+ -samplegroup Views \
+ -samplegroup Wearable
## SDK version identifiers used in the published docs
# major[.minor] version for current SDK. (full releases only)
diff --git a/docs/html/samples/wearable.jd b/docs/html/samples/wearable.jd
new file mode 100644
index 000000000000..311437425a1c
--- /dev/null
+++ b/docs/html/samples/wearable.jd
@@ -0,0 +1,11 @@
+page.title=Wearable
+@jd:body
+
+
+<div id="samples" class="wearable">
+</div>
+
+
+<script>
+ $(document).ready(showSamples);
+</script>