summaryrefslogtreecommitdiffstats
path: root/docs/html/design/patterns/navigation.jd
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2014-02-12 19:31:15 -0800
committerDirk Dougherty <ddougherty@google.com>2014-02-12 19:31:15 -0800
commita97e17785714e5155184199161b3d288f13d0134 (patch)
tree721d2cc88db8212cc8b58a407d1d52bd89e53e8b /docs/html/design/patterns/navigation.jd
parentc462073b24ab7c71e4ba5046c1a28ac27a001d60 (diff)
parent47d3eaf6b1d1aec8517bef6da9e8c3561f21d7bd (diff)
downloadframeworks_base-a97e17785714e5155184199161b3d288f13d0134.zip
frameworks_base-a97e17785714e5155184199161b3d288f13d0134.tar.gz
frameworks_base-a97e17785714e5155184199161b3d288f13d0134.tar.bz2
Merge commit '47d3eaf6' into manualmerge
Conflicts: docs/html/design/patterns/accessibility.jd docs/html/design/patterns/actionbar.jd docs/html/design/patterns/compatibility.jd docs/html/design/patterns/multi-pane-layouts.jd docs/html/design/style/iconography.jd Change-Id: I349cf8ebc159c0a7ef0796900e2d11fe6e0c888a
Diffstat (limited to 'docs/html/design/patterns/navigation.jd')
-rw-r--r--docs/html/design/patterns/navigation.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/design/patterns/navigation.jd b/docs/html/design/patterns/navigation.jd
index 08828e8..3edf6ba 100644
--- a/docs/html/design/patterns/navigation.jd
+++ b/docs/html/design/patterns/navigation.jd
@@ -9,7 +9,7 @@ page.tags=navigation,activity,task,up navigation,back navigation
</div>
</a>
-<p>Consistent navigation is an essential component of the overall user experience. Few things frustrate
+<p itemprop="description">Consistent navigation is an essential component of the overall user experience. Few things frustrate
users more than basic navigation that behaves in inconsistent and unexpected ways. Android 3.0
introduced significant changes to the global navigation behavior. Thoughtfully following the
guidelines for Back and Up will make your app's navigation predictable and reliable for your users.</p>