summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2015-03-18 20:21:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-18 20:22:36 +0000
commitc2eb5c602d36d91483c8f24b0c6859e4283724b4 (patch)
treefe3f01ef24cc348f3cffe2349f7a11974d2b853b /docs/html/guide/topics
parentb3a1b6632e403926fed995e851a8e44fc944c663 (diff)
parent561d1043673df76e626eaebba182f3a54a3068bd (diff)
downloadframeworks_base-c2eb5c602d36d91483c8f24b0c6859e4283724b4.zip
frameworks_base-c2eb5c602d36d91483c8f24b0c6859e4283724b4.tar.gz
frameworks_base-c2eb5c602d36d91483c8f24b0c6859e4283724b4.tar.bz2
Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
Diffstat (limited to 'docs/html/guide/topics')
0 files changed, 0 insertions, 0 deletions