am 8e3250af: am 674b0648: Merge "docs: support library 22.1 feature updates" into lmp-mr1-ub-docs
* commit '8e3250af0f5ac881df4b5f88f4dd784994e979d7':
docs: support library 22.1 feature updates
diff --git a/docs/html/tools/support-library/features.jd b/docs/html/tools/support-library/features.jd
index 0f0a0c0..ee1ed72 100644
--- a/docs/html/tools/support-library/features.jd
+++ b/docs/html/tools/support-library/features.jd
@@ -205,9 +205,12 @@
information on using the Action Bar, see the
<a href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.
</li>
- <li>{@link android.support.v7.app.ActionBarActivity} - Adds an application activity class that
- must be used as a base class for activities that uses the Support Library action bar
- implementation.
+ <li>{@link android.support.v7.app.AppCompatActivity} - Adds an application activity class that can
+ be used as a base class for activities that use the Support Library action bar
+ implementation.
+ </li>
+ <li>{@link android.support.v7.app.AppCompatDialog} - Adds a dialog class that can be used as a base
+ class for AppCompat themed dialogs.
</li>
<li>{@link android.support.v7.widget.ShareActionProvider} - Adds support for a standardized
sharing action (such as email or posting to social applications) that can be included in an