summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2015-03-05 06:18:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-05 06:18:45 +0000
commit4f674bbdf83056141f3dccf1af8af3113e17af87 (patch)
tree52d2a2d9bffc8eba010ec34a3fdea6a943c05e29 /docs
parent28d11557d6846e7ea7fb2593a6ed4d3a16f5eef6 (diff)
parent8b2be54a629e4567152d8b0e6c81332632b0b877 (diff)
downloadframeworks_base-4f674bbdf83056141f3dccf1af8af3113e17af87.zip
frameworks_base-4f674bbdf83056141f3dccf1af8af3113e17af87.tar.gz
frameworks_base-4f674bbdf83056141f3dccf1af8af3113e17af87.tar.bz2
am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '8b2be54a629e4567152d8b0e6c81332632b0b877': add tags for wakelock and other API names
Diffstat (limited to 'docs')
-rw-r--r--docs/html/training/scheduling/index.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/training/scheduling/index.jd b/docs/html/training/scheduling/index.jd
index 4d2db60..4239ffb 100644
--- a/docs/html/training/scheduling/index.jd
+++ b/docs/html/training/scheduling/index.jd
@@ -1,5 +1,5 @@
page.title=Managing Device Awake State
-page.tags=
+page.tags=wakelock, AlarmManager, WakefulBroadcastReceiver
trainingnavtop=true
startpage=true