diff options
| author | Natalie Masse <nmasse@google.com> | 2014-10-24 22:36:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-24 22:36:54 +0000 |
| commit | 60144a7a06d818e7ef22d08722be67c602aeb088 (patch) | |
| tree | a39293556241aa277dd2095bbbc2daf9f1e89f60 | |
| parent | c220d8e57ca97c70db1fd72f040bd6c6f70bbf13 (diff) | |
| parent | bcf9ced47a123220271fcca70f71c2adf69ad100 (diff) | |
| download | frameworks_base-60144a7a06d818e7ef22d08722be67c602aeb088.zip frameworks_base-60144a7a06d818e7ef22d08722be67c602aeb088.tar.gz frameworks_base-60144a7a06d818e7ef22d08722be67c602aeb088.tar.bz2 | |
am bcf9ced4: am 1e5bb861: Link and typo fixed
* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100':
Link and typo fixed
| -rw-r--r-- | docs/html/google/play/billing/billing_testing.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/actionbar.jd | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/google/play/billing/billing_testing.jd b/docs/html/google/play/billing/billing_testing.jd index 10f5326..36456cc 100644 --- a/docs/html/google/play/billing/billing_testing.jd +++ b/docs/html/google/play/billing/billing_testing.jd @@ -10,7 +10,7 @@ page.tags="inapp, billing, iap" <ol> <li><a href="#testing-purchases">Testing In-app Purchases</a></li> <li><a href="#billing-testing-static">Testing with Static Responses</a></li> - <li><a href="#billing-testing-real">Setting Up for Test Purchases</a></li> + <li><a href="#billing-testing-test">Setting Up for Test Purchases</a></li> <li><a href="#draft_apps">Draft Apps are No Longer Supported</a></li> </ol> <h2>See also</h2> diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd index a61696a..d972c47 100644 --- a/docs/html/guide/topics/ui/actionbar.jd +++ b/docs/html/guide/topics/ui/actionbar.jd @@ -1427,7 +1427,7 @@ href="#ActionView">action views</a>.</dd> <p>Here's an example that defines a custom theme for an activity, {@code CustomActivityTheme}, that includes several styles to customize the action bar.</p> -<p>Notice that there are two version for each action bar style property. The first one +<p>Notice that there are two versions for each action bar style property. The first one includes the {@code android:} prefix on the property name to support API levels 11 and higher that include these properties in the framework. The second version does <em>not</em> include the {@code android:} prefix and is for older versions of the platform, on which |