summaryrefslogtreecommitdiffstats
path: root/docs/html/tools
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2015-02-23 18:20:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-23 18:20:37 +0000
commit3570268bcf1e4c375d8b592714f8b7be25819873 (patch)
tree5fb512b5cafaf3901a6e9d4df87e0e6787b85bcc /docs/html/tools
parentf066c2358d48fdc2ecbc28af99bc8332a3d78ce1 (diff)
parent09e9076ddfd5e9f738cd5096409ff3fb61174803 (diff)
downloadframeworks_base-3570268bcf1e4c375d8b592714f8b7be25819873.zip
frameworks_base-3570268bcf1e4c375d8b592714f8b7be25819873.tar.gz
frameworks_base-3570268bcf1e4c375d8b592714f8b7be25819873.tar.bz2
am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '09e9076ddfd5e9f738cd5096409ff3fb61174803': Fixes several typos.
Diffstat (limited to 'docs/html/tools')
-rw-r--r--docs/html/tools/studio/index.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd
index f5c3629..eaa96d3 100644
--- a/docs/html/tools/studio/index.jd
+++ b/docs/html/tools/studio/index.jd
@@ -97,8 +97,8 @@ top level of the project hierarchy and contains these three elements at the top
<code>ic_launcher.png</code> resource for different screen densities under the same element.</p>
<p class="note"><strong>Note:</strong> The project structure on disk differs from this flattened
-representation. To switch to back the segregated project view, select <strong>Project</strong> from
-the <strong>Project</strong drop-down. </p>
+representation. To switch to back to the segregated project view, select <strong>Project</strong> from
+the <strong>Project</strong> drop-down. </p>
@@ -182,7 +182,7 @@ uniquely identify application packages for publishing. The application ID is set
<p class="note"><strong>Note:</strong> The <em>applicationId</em> is specified only in your
build.gradle file, and not in the AndroidManifest.xml file.</p>
-<p>When using build variants, the build system enables you to to uniquely identify different
+<p>When using build variants, the build system enables you to uniquely identify different
packages for each product flavors and build types. The application ID in the build type is added as
a suffix to those specified for the product flavors. </p>