diff options
| author | Scott Main <smain@google.com> | 2011-02-07 21:17:09 -0800 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2011-02-07 21:17:09 -0800 |
| commit | b1ddc7ec5cd28595948644140b77bda282b7df6d (patch) | |
| tree | f9d4670d5ac61840223b644422338f9c8e1a782a /docs/html/guide/tutorials | |
| parent | 5592b0d8fe30c84a4bd8909b5be4166e890d9853 (diff) | |
| parent | 9bf45a00752f84037dcf1aba79e76542b4d4ed22 (diff) | |
resolved conflicts for merge of 9bf45a00 to honeycomb-plus-aosp
Change-Id: I2b2957346a99d5601005831a41033a355df5b163
Diffstat (limited to 'docs/html/guide/tutorials')
| -rw-r--r-- | docs/html/guide/tutorials/notepad/notepad-ex3.jd | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/html/guide/tutorials/notepad/notepad-ex3.jd b/docs/html/guide/tutorials/notepad/notepad-ex3.jd index 573500f1af33..557738e4c105 100644 --- a/docs/html/guide/tutorials/notepad/notepad-ex3.jd +++ b/docs/html/guide/tutorials/notepad/notepad-ex3.jd @@ -203,7 +203,8 @@ and populate the View elements with them.</p> have to store enough state to come back up later, preferably in the same state it was in when it was killed.</p> <p> - Android has a <a href="{@docRoot}guide/topics/fundamentals.html#lcycles">well-defined life + Activities have a <a +href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">well-defined life cycle</a>. Lifecycle events can happen even if you are not handing off control to another Activity explicitly. For example, perhaps a call comes in to the |