diff options
| author | Scott Main <smain@google.com> | 2011-02-18 19:49:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-18 19:49:10 -0800 |
| commit | d2d034f154c935f41a01faef6a5e275150981ea0 (patch) | |
| tree | 0c4da192d8cde0d68423d38669f3631ade2a42c1 /docs | |
| parent | 1ca584a2bb5c0f0e747c98f2e930cce8b53421a5 (diff) | |
| parent | b5d35088cbbbac53b052ec52f199de4ad8b061e7 (diff) | |
| download | frameworks_base-d2d034f154c935f41a01faef6a5e275150981ea0.zip frameworks_base-d2d034f154c935f41a01faef6a5e275150981ea0.tar.gz frameworks_base-d2d034f154c935f41a01faef6a5e275150981ea0.tar.bz2 | |
am b5d35088: resolved conflicts for merge of b842629c to honeycomb-plus-aosp
* commit 'b5d35088cbbbac53b052ec52f199de4ad8b061e7':
docs: update sizes and sums for tools and ndk
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/sdk/eclipse-adt.jd | 8 | ||||
| -rw-r--r-- | docs/html/sdk/index.jd | 24 | ||||
| -rw-r--r-- | docs/html/sdk/ndk/index.jd | 18 |
3 files changed, 25 insertions, 25 deletions
diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd index 355465b..3a7b39f 100644 --- a/docs/html/sdk/eclipse-adt.jd +++ b/docs/html/sdk/eclipse-adt.jd @@ -1,8 +1,8 @@ page.title=ADT Plugin for Eclipse -adt.zip.version=9.0.0 -adt.zip.download=ADT_9.0.0.zip -adt.zip.bytes=4433536 -adt.zip.checksum=bc2757f2a5a11d131390ce547bae154b +adt.zip.version=10.0.0 +adt.zip.download=ADT-10.0.0.zip +adt.zip.bytes=4243777 +adt.zip.checksum=bf88bff62bc45c3b6d062e2beed67765 @jd:body diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index 1b4a336..df8869e 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -1,21 +1,21 @@ page.title=Android SDK sdk.redirect=0 -sdk.win_installer=installer_r09-windows.exe -sdk.win_installer_bytes=32828818 -sdk.win_installer_checksum=ef92e643731f820360e036eb11658656 +sdk.win_installer=installer_r10-windows.exe +sdk.win_installer_bytes=32845713 +sdk.win_installer_checksum=4e4356c472a6271ac9c062df0219dcb3 -sdk.win_download=android-sdk_r09-windows.zip -sdk.win_bytes=32779808 -sdk.win_checksum=1a1bb8fad80bcc2dfbd00443b9a13e6b +sdk.win_download=android-sdk_r10-windows.zip +sdk.win_bytes=30112516 +sdk.win_checksum=643a75d99f5d4ca39dcf743fe894d599 -sdk.mac_download=android-sdk_r09-mac_x86.zip -sdk.mac_bytes=28829553 -sdk.mac_checksum=ef3102fdbbbbd9bf4d9b572624aa9dc1 +sdk.mac_download=android-sdk_r10-mac_x86.zip +sdk.mac_bytes=28224540 +sdk.mac_checksum=4d0a99a458e4f4bde65a01f8545f27e9 -sdk.linux_download=android-sdk_r09-linux_x86.tgz -sdk.linux_bytes=26917824 -sdk.linux_checksum=9fefac5ff85d329836439f6e77a78cae +sdk.linux_download=android-sdk_r10-linux_x86.tgz +sdk.linux_bytes=26556013 +sdk.linux_checksum=10cafdd44771bfe2ba9d4440886389e7 @jd:body diff --git a/docs/html/sdk/ndk/index.jd b/docs/html/sdk/ndk/index.jd index 10887c6..40231a3 100644 --- a/docs/html/sdk/ndk/index.jd +++ b/docs/html/sdk/ndk/index.jd @@ -1,16 +1,16 @@ ndk=true -ndk.win_download=android-ndk-r5b-windows.zip -ndk.win_bytes=61299831 -ndk.win_checksum=87745ada305ab639399161ab4faf684c +ndk.win_download=android-ndk-r6-windows.zip +ndk.win_bytes=64147764 +ndk.win_checksum=771b56328b7fc7751aa8040fb9dd09f0 -ndk.mac_download=android-ndk-r5b-darwin-x86.tar.bz2 -ndk.mac_bytes=50210863 -ndk.mac_checksum=019a14622a377b3727ec789af6707037 +ndk.mac_download=android-ndk-r6-darwin-x86.tar.bz2 +ndk.mac_bytes=50244722 +ndk.mac_checksum=d107f6d63478b73e09ed2eecd4c62bd3 -ndk.linux_download=android-ndk-r5b-linux-x86.tar.bz2 -ndk.linux_bytes=44138539 -ndk.linux_checksum=4c0045ddc2bfd657be9d5177d0e0b7e7 +ndk.linux_download=android-ndk-r6-linux-x86.tar.bz2 +ndk.linux_bytes=44088689 +ndk.linux_checksum=c83c3ab5a5e5a3b3fe7b907735ce77d4 page.title=Android NDK @jd:body |