summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2015-02-23 18:33:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-23 18:33:08 +0000
commit84e40b1f338eba0a352a6bf3a0f2801c21e17d59 (patch)
treeef26f771f625e3936c2a742d14177c26a47c2521
parent2c6894685dff6c6f8bbb1af59cf9c8f4acb162c8 (diff)
parentd77380b856050a5d933cbd4cc0ada6192de65f48 (diff)
downloadframeworks_base-84e40b1f338eba0a352a6bf3a0f2801c21e17d59.zip
frameworks_base-84e40b1f338eba0a352a6bf3a0f2801c21e17d59.tar.gz
frameworks_base-84e40b1f338eba0a352a6bf3a0f2801c21e17d59.tar.bz2
am d77380b8: am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs
* commit 'd77380b856050a5d933cbd4cc0ada6192de65f48': Fixes several typos.
-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>