783 Commits

Author SHA1 Message Date
Rich Slogar
7dfd737c4c am 4649dcd7: am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs automerge: e9e2707
automerge: 9c64950

* commit '9c64950ee269eda596f894c05224b51b8be53739':
  docs: linux requirements update
2015-01-30 02:18:32 +00:00
Rich Slogar
d7ffcad49b docs: linux requirements update
b/18371514

Change-Id: I8e320b53bca248d37bff22e4313041d0c138779f
2015-01-21 15:36:02 -08:00
Joe Fernandez
46d2b80fe2 am 8871470c: am 5444e342: am fadcbc70: am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs
* commit '8871470cedf4f6863fbba8c7d253607a9bac0246':
  docs: studio disk space requirements typo
2015-01-16 20:18:33 +00:00
Joe Fernandez
3f4242b89a am ea765e7d: am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
automerge: dbe3aba

* commit 'dbe3aba4a54bca629b727d81906516a22eee3c5c':
  docs: studio bundle checksum update
2015-01-07 10:21:24 +00:00
Ricardo Cervera
c5a1c1363c resolved conflicts for merge of 6302a72a to master
Change-Id: I3adbbb983a2d7b0b85d3de0b14cbb2619aa711dd
2015-01-06 16:31:37 -08:00
Joe Fernandez
b63166afd3 am c632031a: am 27195338: am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs
automerge: 7cf74ee

* commit '7cf74ee6e2c51afaf07e29f8597475ec289a20ed':
  docs: studio build output dir name update
2015-01-06 20:01:43 +00:00
Nick Kralevich
cfea9fbc53 resolved conflicts for merge of 175ef812 to master
Change-Id: I2c6f407fa56b13c54571f8a51573a4b45d251dbb
2015-01-06 11:50:08 -08:00
Nick Kralevich
0e55e3565e resolved conflicts for merge of 1779fd15 to master
Change-Id: I36b60b943a9cfe53bbbf455cf4e94579bfbfbc69
2015-01-06 11:29:44 -08:00
Rich Slogar
15a1166184 docs: studio disk space requirements typo
Change-Id: I8a5cdbc10aab5a67706e3e1c19f1712c10674bd8
2015-01-06 11:10:52 -08:00
Joe Fernandez
acb35e19d1 Merge "docs: studio bundle checksum update" into lmp-docs 2015-01-06 17:46:04 +00:00
Rich Slogar
626128b1db docs: studio bundle checksum update
Change-Id: I3307009db1be1c4d6f01d158d577a6c373b316bf
2015-01-05 16:23:55 -08:00
Ricardo Cervera
4bb503cf12 docs: Minor fixes in Android Studio pages.
https://code.google.com/p/android/issues/detail?id=92839
https://code.google.com/p/android/issues/detail?id=92840
https://code.google.com/p/android/issues/detail?id=92661

Change-Id: I8a45112371da6ca144e0da28701a92254d98774b
2015-01-05 09:31:41 -08:00
Joe Fernandez
afc3b9e7f5 Merge "docs: studio build output dir name update" into lmp-docs 2014-12-19 05:35:19 +00:00
Joe Fernandez
e6395cd34c Merge "docs: project file and toc updates" into lmp-docs 2014-12-19 05:28:36 +00:00
Joe Fernandez
1092bafa1d Merge "docs: studio tips and ticks grammmar typo" into lmp-docs 2014-12-19 05:20:53 +00:00
Rich Slogar
1dafeb3041 docs: studio build output dir name update
b/18670283

Change-Id: Iae80825ba205abbd99561acee0bc63986d195b15
2014-12-18 14:21:39 -08:00
Rich Slogar
3f8e456be7 docs: project file and toc updates
b/18681310

Change-Id: I0a4d4a85f60d0e9dccfbec86e6e54a718d43503a
2014-12-18 13:58:06 -08:00
Rich Slogar
d1a274f283 am 6dfc3aab: am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 automerge: 85e645a automerge: bdc1a3d
automerge: 3a586c0

* commit '3a586c032c2cf39da72882c6466aa198ec7c85dc':
  docs: sdk revision 24.0.2
2014-12-18 02:03:53 +00:00
Rich Slogar
8838a9f083 docs: sdk revision 24.0.2
Change-Id: I2427885aded49e7ceab5d66c8cb8d12cea19bc2c
2014-12-17 16:40:53 -08:00
smain@google.com
1dd971866a am 2dbb8e13: am 2448afdb: am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 automerge: 2a53e24 automerge: c6de288
* commit '2dbb8e13de3a7ced961bbf84733f47e21a6a823d':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
2014-12-17 20:12:23 +00:00
Joe Fernandez
099e49872c am 09d6ed50: am a5142ca4: am 85787187: am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs automerge: 9381301
* commit '09d6ed50a7e470c8f2b63736a66ceed11f9cbd49':
  docs: help-adt link updates
2014-12-17 17:55:47 +00:00
smain@google.com
4842228377 Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs 2014-12-17 17:52:08 +00:00
smain@google.com
58bd02739e make hidden text hidden with negative indent to avoid horizontal scroll
bug: 18721145

Change-Id: I6efe51071d9d93697f1412243468353cd0c6d166
2014-12-17 09:50:26 -08:00
Joe Fernandez
740436b676 Merge "docs: help-adt link updates" into lmp-docs 2014-12-17 01:44:22 +00:00
smain@google.com
87e74132bf am eb9a4607: am 1d97aebd: am 9af05a68: am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download automerge: c21b455
* commit 'eb9a46075f13cb0c0ffbb1dd9cf935fd694f1b76':
  brute force improve suggestions for sdk download
2014-12-16 11:02:38 +00:00
Narayan Kamath
d02a898528 resolved conflicts for merge of f44fdaed to master
Change-Id: I324b252123b7fc4a38aad9be4b986cb564a17b14
2014-12-16 10:57:05 +00:00
smain@google.com
68e6819bd0 brute force improve suggestions for sdk download
Change-Id: I4698058a12472a65e67cadc3d0e3dd1ffed1b384
2014-12-15 10:00:59 -08:00
smain@google.com
0baa12cee3 Merge "followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6" 2014-12-15 15:56:55 +00:00
smain@google.com
5d0766a80e followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6
Change-Id: I5796348197732f6c9e72fcbdbca5fcd4934f8994
2014-12-15 07:39:52 -08:00
Rich Slogar
6b8756c397 docs: studio 1.0.1 revision update
Change-Id: If9ef9ba986ae02463bec8040924a06ab0ccc8124
2014-12-12 21:19:02 -08:00
Rich Slogar
50ff944c02 docs: help-adt link updates
Change-Id: I60fdea090d330a90ebf12b954fa312dbd49cec29
2014-12-12 09:59:02 -08:00
Rich Slogar
bde459f33e am cc46ad8d: am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs automerge: 51f1c26
* commit 'cc46ad8d66d71867ff59bcd73b8e0861ef1744c5':
  docs: studio bundle update
2014-12-12 04:25:49 +00:00
Rich Slogar
26d4e8f3e8 docs: studio tips and ticks grammmar typo
Change-Id: Ica1f4849e090b43d9a68de3c350e3839d07f0695
2014-12-11 13:25:44 -08:00
Rich Slogar
d35216ad36 Merge "docs: studio bundle update" into lmp-docs 2014-12-11 19:04:03 +00:00
Rich Slogar
2f8f42f897 docs: studio bundle update
Change-Id: I232a61ae6747b879e8a36f8e4942d6a3406c4162
2014-12-11 10:51:41 -08:00
smain@google.com
2c3c4b168b am 835ad716: am 5a267e72: am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased l
* commit '835ad71635638f1154a887464758fe81457da327':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
2014-12-10 21:58:06 +00:00
smain@google.com
848b1c2201 am b1d41255: am 92b6011d: am 9ecc18e2: am 4267450e: am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link
* commit 'b1d41255540256136b058726e0e3efb0439e713f':
  revise ADT migration message b/18668828 and fix broken link
2014-12-10 17:42:54 +00:00
Joe Fernandez
349d5f028e am 4ddf70db: am 55677d8a: am 33a0828e: am 2a83bc2b: am 4c3b3324: am f4814b87: docs: Change Eclipse deprecation language on sdk/index.html page
* commit '4ddf70db557cceaf8b19140026844ca9bdd9de00':
  docs: Change Eclipse deprecation language on sdk/index.html page
2014-12-10 17:35:01 +00:00
Nick Kralevich
d5180176cb resolved conflicts for merge of ef7708f8 to master
Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6
2014-12-10 08:36:37 -08:00
smain@google.com
cf18fa6cd8 misc updates related to Android Studio.
clarify a few doc titles for improved search results clarity.
update "get started" page link to Android Studio, add First App link,
and remove some biased language.

Change-Id: I5e4faef8a6eb0a08eec45981a4f9436cb07a995c
2014-12-09 17:26:07 -08:00
Dmitriy Ivanov
33f6c9f45d resolved conflicts for merge of bd5098e6 to master
Change-Id: I5959958476c3edc16f9a13a06517f70be7ec32e3
2014-12-09 17:22:31 -08:00
Joe Fernandez
b35a509d0e Merge ":docs studio tips and tricks headings updates" into lmp-docs 2014-12-09 22:56:37 +00:00
smain@google.com
eff93430fb am c37424dc: am 54403cf8: am 97afbe1e: am 39519067: am a4924046: am d48168bd: add survey link
* commit 'c37424dcfe3a354c7528855a64bf09b943e8b035':
  add survey link
2014-12-09 22:23:28 +00:00
Rich Slogar
5053344bb6 :docs studio tips and tricks headings updates
Change-Id: I5453263b575610b6f418569bdf79f73a693c641b
2014-12-09 14:23:18 -08:00
smain@google.com
f47eadf7fa am 4df464d0: am 8bd51aa5: am 983ba2ba: am 9a379e73: am 341c518f: am 43838855: fix migrate instruction step
* commit '4df464d053669392e1f1c235744ff5359b9f84cd':
  fix migrate instruction step
2014-12-09 22:22:56 +00:00
smain@google.com
b56db728fa resolved conflicts for merge of c137d08c to master
Change-Id: I1addaa7b46e893014eca23746c6bf5f7e71dc2ca
2014-12-09 14:19:57 -08:00
smain@google.com
2b08f538d1 resolved conflicts for merge of 132004f8 to master
Change-Id: I35c6ef810daf2b1329c46798fe6c7e6f2c1dfc82
2014-12-09 14:14:11 -08:00
Joe Fernandez
ead7b78b9e resolved conflicts for merge of 66189de6 to master
Change-Id: Id4a80013dd506bd1135dd931450ee2a08a4c77aa
2014-12-09 13:58:23 -08:00
smain@google.com
3bf22c31e8 am 7e5fbc1d: am 8804b2a6: am 4e0575be: am c10acd71: am 9a041f18: am d3c9f2b9: update studio hero image and add section about code editor [CP]
* commit '7e5fbc1dc03e577ae37bfbc634a2ebb2cd2c5b32':
  update studio hero image and add section about code editor [CP]
2014-12-09 14:52:16 +00:00
smain@google.com
2023bec7bf revise ADT migration message
b/18668828
and fix broken link

Change-Id: I64cba60ebdd0649a0394e0f4284160514f56099e
2014-12-08 19:37:17 -08:00