summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/components/activities.jd
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2014-06-12 19:23:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-12 19:23:48 +0000
commit3a1d38b33112534709337c3477d52404747f5172 (patch)
treed2c76028fbd4f8f58255f0d446b52c5b89cce351 /docs/html/guide/components/activities.jd
parentad60891a6ecaf2a5815677b33e96afe7f49ee113 (diff)
parent91b078c8dcce20d5b04f14f730e35cc0b25b4041 (diff)
downloadframeworks_base-3a1d38b33112534709337c3477d52404747f5172.zip
frameworks_base-3a1d38b33112534709337c3477d52404747f5172.tar.gz
frameworks_base-3a1d38b33112534709337c3477d52404747f5172.tar.bz2
am 91b078c8: am 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev
* commit '91b078c8dcce20d5b04f14f730e35cc0b25b4041': reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter.
Diffstat (limited to 'docs/html/guide/components/activities.jd')
0 files changed, 0 insertions, 0 deletions