summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2014-07-17 20:27:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-17 20:27:03 +0000
commit049cadd8c965ad69b875cd5ed7768c1b162acb39 (patch)
treec0766de9d312c6f63060cc088b648fa55e1e5f42 /docs
parent9353e1a2b2e8f02377c3f73565964ffb0927c776 (diff)
parentf1b18ded01adf94ee34dbd95a86616d8eadbdf06 (diff)
downloadframeworks_base-049cadd8c965ad69b875cd5ed7768c1b162acb39.zip
frameworks_base-049cadd8c965ad69b875cd5ed7768c1b162acb39.tar.gz
frameworks_base-049cadd8c965ad69b875cd5ed7768c1b162acb39.tar.bz2
am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs
* commit 'f1b18ded01adf94ee34dbd95a86616d8eadbdf06': docs: Fix typo in Wear docs. Bug: 16327298
Diffstat (limited to 'docs')
-rw-r--r--docs/html/training/wearables/apps/creating.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/training/wearables/apps/creating.jd b/docs/html/training/wearables/apps/creating.jd
index 49f8b0e..09a90c8 100644
--- a/docs/html/training/wearables/apps/creating.jd
+++ b/docs/html/training/wearables/apps/creating.jd
@@ -161,8 +161,8 @@ dependencies are imported for you in the appropriate module's <code>build.gradle
However, these dependencies are not required, so read the following descriptions to find out if you need them or not:</p>
<b>Notifications</b>
-<p>The <a href="{@docRoot}tools/support-library/features.html#v4">The
-Android v4 support library</a> (or v13, which includes v4)
+<p>The <a href="{@docRoot}tools/support-library/features.html#v4">Android
+v4 support library</a> (or v13, which includes v4)
contains the APIs to extend your existing notifications on handhelds to support wearables.</p>
<p>For notifications that appear only on