summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2012-11-01 14:23:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-01 14:23:30 -0700
commitf9e7b61867316057f80a92804da0b5800bd4c01a (patch)
tree5a55e4381260aa7eda3f9b5df8cc4eb695005bfb
parent1f177cb87a87b26fe302298f96197766ebddaf96 (diff)
parent93a9a0a2bc2173d942f2c37d0751a9e4df8ecb24 (diff)
downloadframeworks_base-f9e7b61867316057f80a92804da0b5800bd4c01a.zip
frameworks_base-f9e7b61867316057f80a92804da0b5800bd4c01a.tar.gz
frameworks_base-f9e7b61867316057f80a92804da0b5800bd4c01a.tar.bz2
am 93a9a0a2: am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
* commit '93a9a0a2bc2173d942f2c37d0751a9e4df8ecb24': docs: google market -> google play
-rw-r--r--docs/html/guide/google/play/expansion-files.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/google/play/expansion-files.jd b/docs/html/guide/google/play/expansion-files.jd
index 750e958..f5cda06 100644
--- a/docs/html/guide/google/play/expansion-files.jd
+++ b/docs/html/guide/google/play/expansion-files.jd
@@ -421,7 +421,7 @@ policy, which captures the expansion file names, sizes, and URLs from the licens
<p>To use APK expansion files with your application and provide the best user experience with
minimal effort on your behalf, we recommend you use the Downloader Library that's included in the
-Google Market Apk Expansion package. This library downloads your expansion files in a
+Google Play APK Expansion Library package. This library downloads your expansion files in a
background service, shows a user notification with the download status, handles network
connectivity loss, resumes the download when possible, and more.</p>
@@ -450,8 +450,8 @@ application.</p>
<p>First, open the <a href="{@docRoot}sdk/exploring.html">Android SDK Manager</a>, expand
<em>Extras</em> and download:</p>
<ul>
- <li><em>Google Market Licensing package</em></li>
- <li><em>Google Market Apk Expansion package</em></li>
+ <li><em>Google Play Licensing Library package</em></li>
+ <li><em>Google Play APK Expansion Library package</em></li>
</ul>
<p>If you're using Eclipse, create a project for each library and add it to your app:</p>