summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2014-07-06 22:35:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-06 22:35:44 +0000
commit993a3e49774596642e7c8fc35e53d58e54e35603 (patch)
tree70528316a565ca5a88f8a7bb07874a057dec4c86 /docs/html/training
parentbd66e55b1079846e424c36a68a375ff7d73f6b27 (diff)
parent048d1076aeb96adea969ad95996d3df931557241 (diff)
downloadframeworks_base-993a3e49774596642e7c8fc35e53d58e54e35603.zip
frameworks_base-993a3e49774596642e7c8fc35e53d58e54e35603.tar.gz
frameworks_base-993a3e49774596642e7c8fc35e53d58e54e35603.tar.bz2
am 048d1076: am 8f0f930d: Merge "Fix incorrect link in Android Wear documentation." into klp-modular-dev
* commit '048d1076aeb96adea969ad95996d3df931557241': Fix incorrect link in Android Wear documentation.
Diffstat (limited to 'docs/html/training')
-rw-r--r--docs/html/training/wearables/apps/creating.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/training/wearables/apps/creating.jd b/docs/html/training/wearables/apps/creating.jd
index a5107d7..f6b96e2 100644
--- a/docs/html/training/wearables/apps/creating.jd
+++ b/docs/html/training/wearables/apps/creating.jd
@@ -140,7 +140,7 @@ receives the wearable app.</p>
<p class="note"><b>Note:</b> The automatic installation of wearable apps
does not work when you are signing apps with a debug key and only works with release keys. See
-<a href="{@docRoot}traiing/wearables/packaging.html">Packaging Wearable Apps</a> for
+<a href="{@docRoot}training/wearables/apps/packaging.html">Packaging Wearable Apps</a> for
complete information on how to properly package wearable apps.</p>
<li>