summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2015-03-05 06:40:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-05 06:40:13 +0000
commit49c00ffbad00ff6de5a74cbc3f8606aa7c12cb6b (patch)
tree040df198c07a465066bd977dea1dcb21b8c5de6f /docs
parentec5032c1cd7aad867fd78280e081314eb7bde100 (diff)
parent9f4e1f7f501b934b72e7abefecc61b5666ee4463 (diff)
downloadframeworks_base-49c00ffbad00ff6de5a74cbc3f8606aa7c12cb6b.zip
frameworks_base-49c00ffbad00ff6de5a74cbc3f8606aa7c12cb6b.tar.gz
frameworks_base-49c00ffbad00ff6de5a74cbc3f8606aa7c12cb6b.tar.bz2
am 9f4e1f7f: am b488a256: am 4f674bbd: am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '9f4e1f7f501b934b72e7abefecc61b5666ee4463': 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