tree 53a968a0338257d0e3d354fa9bd484a287d79e2e
parent d51a5b389187ad7db3444a74dc75439ff739d7dc
parent 55c11af78a34f6746b9b5fcf8aa487eef797ea2e
author Scott Main <smain@google.com> 1402599874 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402599874 +0000

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 '55c11af78a34f6746b9b5fcf8aa487eef797ea2e':
  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.