diff options
| author | Scott Main <smain@google.com> | 2010-10-04 18:37:40 -0700 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2010-10-04 18:42:49 -0700 |
| commit | d9ec8eba56ea9f1e2b920e0a8e8b575d75a1be30 (patch) | |
| tree | ef791fc6366b3158a9ec09e704ef39ee91563e81 /docs/html/guide/topics/fundamentals.jd | |
| parent | 629e26bbef04a211f37a3b9c50dbf1ba4f9be6cb (diff) | |
| parent | 7008b7c1c47ed47bcd895e4a660cef91da048645 (diff) | |
| download | frameworks_base-d9ec8eba56ea9f1e2b920e0a8e8b575d75a1be30.zip frameworks_base-d9ec8eba56ea9f1e2b920e0a8e8b575d75a1be30.tar.gz frameworks_base-d9ec8eba56ea9f1e2b920e0a8e8b575d75a1be30.tar.bz2 | |
resolved conflicts for merge of 7008b7c1 to master
Change-Id: I360136e54229cae1fc0fa15eab8f1490b8a0fb5e
Diffstat (limited to 'docs/html/guide/topics/fundamentals.jd')
| -rw-r--r-- | docs/html/guide/topics/fundamentals.jd | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/docs/html/guide/topics/fundamentals.jd b/docs/html/guide/topics/fundamentals.jd index db06efc..84c2ed2 100644 --- a/docs/html/guide/topics/fundamentals.jd +++ b/docs/html/guide/topics/fundamentals.jd @@ -3,14 +3,6 @@ page.title=Application Fundamentals <div id="qv-wrapper"> <div id="qv"> -<h2>Key classes</h2> -<ol> -<li>{@link android.app.Activity}</li> -<li>{@link android.app.Service}</li> -<li>{@link android.content.BroadcastReceiver}</li> -<li>{@link android.content.ContentProvider}</li> -<li>{@link android.content.Intent}</li> -</ol> <h2>In this document</h2> <ol> @@ -43,6 +35,16 @@ page.title=Application Fundamentals <li><a href="#proclife">Processes and lifecycles</a></li> </ol></li> </ol> + +<h2>Key classes</h2> +<ol> +<li>{@link android.app.Activity}</li> +<li>{@link android.app.Service}</li> +<li>{@link android.content.BroadcastReceiver}</li> +<li>{@link android.content.ContentProvider}</li> +<li>{@link android.content.Intent}</li> +</ol> + </div> </div> |