diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-12-09 17:20:48 -0800 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-12-09 17:22:31 -0800 |
| commit | 33f6c9f45de876a3e588ec15dda2088afd7a3b5c (patch) | |
| tree | 99cd0c21a13b4bf3ad1c7590511b1e250feb04e7 /docs/html/tools/studio/index.jd | |
| parent | c73923bcf9f1ec488c04430db9a6de8c03028a2c (diff) | |
| parent | bd5098e6b4a3f21782f140654086c2893fbadd27 (diff) | |
| download | frameworks_base-33f6c9f45de876a3e588ec15dda2088afd7a3b5c.zip frameworks_base-33f6c9f45de876a3e588ec15dda2088afd7a3b5c.tar.gz frameworks_base-33f6c9f45de876a3e588ec15dda2088afd7a3b5c.tar.bz2 | |
resolved conflicts for merge of bd5098e6 to master
Change-Id: I5959958476c3edc16f9a13a06517f70be7ec32e3
Diffstat (limited to 'docs/html/tools/studio/index.jd')
| -rw-r--r-- | docs/html/tools/studio/index.jd | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd index c7451a7..5f150b5 100644 --- a/docs/html/tools/studio/index.jd +++ b/docs/html/tools/studio/index.jd @@ -102,9 +102,8 @@ the <strong>Project</strong drop-down. </p> <h3>New Project and Directory Structure</h3> -<p>When you use the <em>Project</em> view of a new project in Android Studio or -(<a href="{@docRoot}tools/eclipse/migrate-adt.html"> a project migrated from Eclipse</a>), you -should notice that the project structure appears different than you may be used to. Each +<p>When you use the <em>Project</em> view of a new project in Android Studio, you +should notice that the project structure appears different than you may be used to in Eclipse. Each instance of Android Studio contains a project with one or more application modules. Each application module folder contains the complete source sets for that module, including {@code src/main} and {@code src/androidTest} directories, resources, build |