summaryrefslogtreecommitdiffstats
path: root/docs/html/guide
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-07-24 16:19:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-24 16:19:42 -0700
commit5aaf38590130f3b56bcbcc74d2fead1da111b29d (patch)
treef65f9a710cb4651aafc9bf35a8ee8beb6b119a1c /docs/html/guide
parentc3427dc4da9d0a1471f0ca0f938d481a805e51db (diff)
parentef43b7617c3b067d5d1f34ed41581f55c28c0659 (diff)
downloadframeworks_base-5aaf38590130f3b56bcbcc74d2fead1da111b29d.zip
frameworks_base-5aaf38590130f3b56bcbcc74d2fead1da111b29d.tar.gz
frameworks_base-5aaf38590130f3b56bcbcc74d2fead1da111b29d.tar.bz2
am ef43b761: am 2edf372e: fix javadoc error
* commit 'ef43b7617c3b067d5d1f34ed41581f55c28c0659': fix javadoc error
Diffstat (limited to 'docs/html/guide')
-rw-r--r--docs/html/guide/topics/ui/actionbar.jd3
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd
index 23ef518..453d9d7 100644
--- a/docs/html/guide/topics/ui/actionbar.jd
+++ b/docs/html/guide/topics/ui/actionbar.jd
@@ -772,8 +772,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
/** Defines a default (dummy) share intent to initialize the action provider.
* However, as soon as the actual content to be used in the intent
* is known or changes, you must update the share intent by again calling
- * mShareActionProvider.{@link
- * android.support.v7.widget.ShareActionProvider#setShareIntent setShareIntent()}
+ * mShareActionProvider.{@link android.support.v7.widget.ShareActionProvider#setShareIntent setShareIntent()}
*/
private Intent getDefaultIntent() {
Intent intent = new Intent(Intent.ACTION_SEND);