tree d2c76028fbd4f8f58255f0d446b52c5b89cce351
parent ad60891a6ecaf2a5815677b33e96afe7f49ee113
parent 91b078c8dcce20d5b04f14f730e35cc0b25b4041
author Scott Main <smain@google.com> 1402601028 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402601028 +0000

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.