Trevor Johns
682c24e228
Resolve merge conflicts of a5060ee to nyc-dev
...
This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Scott Main
28a3897d08
docs: re-add download.jd file to support archived SDK downloads
...
Change-Id: If814238c8fa017ce10e7fe770826a1e162fe5e87
2012-07-17 13:19:20 -07:00
Scott Main
50e990c64f
Massive clobber of all HTML files in developer docs for new site design
...
Change-Id: Idc55a0b368c1d2c1e7d4999601b739dd57f08eb3
2012-06-21 21:27:30 -07:00
Scott Main
d08debcb21
docs: bring back the SDK EULA wall for downloading archived SDKs
...
Change-Id: Ieccd0d03ca49a68d7d4956aa4991d8a73ffff674
2011-04-14 12:31:17 -07:00
Scott Main
654d9414de
docs: Remove the TOS from download flow and remove TOS entirely because
...
it's no longer relevant to the SDK download package
Change-Id: I5f0b2b6258db1f09f300567fc0d22b5e3effd324
2010-06-24 17:29:13 -07:00
Dirk Dougherty
3250756743
AI 146572: am: CL 146343 am: CL 146340 Integrate updated SDK Terms and Conditions document
...
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146572
2009-04-18 21:07:05 -07:00
Dirk Dougherty
4e44b76fdf
AI 146010: am: CL 145858 am: CL 145559 Cleanup for early-look SDK.
...
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146010
2009-04-13 16:51:21 -07:00
The Android Open Source Project
9066cfe988
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce
auto import from //depot/cupcake/@135843
2009-03-03 18:28:45 -08:00
The Android Open Source Project
d24b8183b9
auto import from //branches/cupcake/...@130745
2009-02-10 15:44:00 -08:00
