summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2014-06-12 19:04:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-12 19:04:34 +0000
commit91b078c8dcce20d5b04f14f730e35cc0b25b4041 (patch)
tree53a968a0338257d0e3d354fa9bd484a287d79e2e /core/java/android
parentd51a5b389187ad7db3444a74dc75439ff739d7dc (diff)
parent55c11af78a34f6746b9b5fcf8aa487eef797ea2e (diff)
downloadframeworks_base-91b078c8dcce20d5b04f14f730e35cc0b25b4041.zip
frameworks_base-91b078c8dcce20d5b04f14f730e35cc0b25b4041.tar.gz
frameworks_base-91b078c8dcce20d5b04f14f730e35cc0b25b4041.tar.bz2
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.
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions