Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 6248cdd5 to master

Browse Source 
Change-Id: I4f7f69c28c90ff4fb8e2db9468d8024162f62c7b
This commit is contained in:
David Friedman
2015-02-23 14:40:41 -08:00
parent 6a8253fdc9 6248cdd588
commit 704ebab343
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docs/html/tools/studio/index.jd
View File

@@ -96,10 +96,9 @@ top level of the project hierarchy and contains these three elements at the top
<p>For example, <em>Android</em> project view groups all the instances of the
<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>
<p class="note"><strong>Note:</strong> The project structure on disk differs from this flattened
representation. To switch to back to the segregated project view, select <strong>Project</strong> from
the <strong>Project</strong> drop-down. </p>
<h3>Android Studio Project and Directory Structure</h3>
@@ -182,7 +181,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>