summaryrefslogtreecommitdiffstats
path: root/docs/html/training/basics/activity-lifecycle/pausing.jd
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-11-21 10:19:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-21 10:19:49 +0000
commit2dc4cfa09617cfa660728b3c972f840853a80583 (patch)
tree314e27eb7e6413b04370f8bb0f26156e797b2922 /docs/html/training/basics/activity-lifecycle/pausing.jd
parent5b51858dc29f7892c17c82ef1c2fecf767c89f41 (diff)
parent39d6b21ee5021d3efd1bb4e8f2041d9d8251c298 (diff)
downloadframeworks_base-2dc4cfa09617cfa660728b3c972f840853a80583.zip
frameworks_base-2dc4cfa09617cfa660728b3c972f840853a80583.tar.gz
frameworks_base-2dc4cfa09617cfa660728b3c972f840853a80583.tar.bz2
am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge: 6e08d30
automerge: 39d6b21 * commit '39d6b21ee5021d3efd1bb4e8f2041d9d8251c298': add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
Diffstat (limited to 'docs/html/training/basics/activity-lifecycle/pausing.jd')
-rw-r--r--docs/html/training/basics/activity-lifecycle/pausing.jd8
1 files changed, 2 insertions, 6 deletions
diff --git a/docs/html/training/basics/activity-lifecycle/pausing.jd b/docs/html/training/basics/activity-lifecycle/pausing.jd
index f656fce..de2c92a 100644
--- a/docs/html/training/basics/activity-lifecycle/pausing.jd
+++ b/docs/html/training/basics/activity-lifecycle/pausing.jd
@@ -1,12 +1,8 @@
page.title=Pausing and Resuming an Activity
-parent.title=Managing the Activity Lifecycle
-parent.link=index.html
+page.tags=activity lifecycle
+helpoutsWidget=true
trainingnavtop=true
-previous.title=Starting an Activity
-previous.link=starting.html
-next.title=Stopping and Restarting an Activity
-next.link=stopping.html
@jd:body