Chris Banes 6026f73406 resolved conflicts for merge of 1c131eeb to master ...

Change-Id: I886d726322514fa3b27cdc80b8dd57faa94bade5

2015-02-18 11:02:49 +00:00

..

adding-packages.jd

misc fixes for studio launch:

2014-12-08 00:33:15 -08:00

bundle.jd

…

create-project.jd

docs: studio mipmap update

2015-02-13 17:17:41 -08:00

index.jd

am eb9a4607: am 1d97aebd: am 9af05a68: am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download automerge: c21b455

2014-12-16 11:02:38 +00:00

installing-adt.jd

revise ADT migration message

2014-12-08 19:37:17 -08:00

migrate.jd

am 4df464d0: am 8bd51aa5: am 983ba2ba: am 9a379e73: am 341c518f: am 43838855: fix migrate instruction step

2014-12-09 22:22:56 +00:00

studio-androidview.jd

…

studio-build.jd

docs: studio build output dir name update

2014-12-18 14:21:39 -08:00

studio-layout.jd

…

studio-tips.jd

resolved conflicts for merge of 6302a72a to master

2015-01-06 16:31:37 -08:00