diff options
author | Scott Main <smain@google.com> | 2011-02-08 10:31:51 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-08 10:31:51 -0800 |
commit | f602872d7ae5051089dba2d46d212e2cc374ac27 (patch) | |
tree | 288ae7cfdf475293987f7e5f6f59ef5a7d53f690 /docs | |
parent | c65c5fdec19913bc2723947a92e1379b90368a8f (diff) | |
parent | c2ab8e41d081395b5b7577ae60ab73e94d7c37e4 (diff) | |
download | frameworks_base-f602872d7ae5051089dba2d46d212e2cc374ac27.zip frameworks_base-f602872d7ae5051089dba2d46d212e2cc374ac27.tar.gz frameworks_base-f602872d7ae5051089dba2d46d212e2cc374ac27.tar.bz2 |
am c2ab8e41: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 Plus some misc changes to merge from Change-Id: Ibb8490b2c6bae2d9df15326c7ffbcf83b638acc6 update OEM driver list with new fujitsu and kyocera
* commit 'c2ab8e41d081395b5b7577ae60ab73e94d7c37e4':
cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 Plus some misc changes to merge from Change-Id: Ibb8490b2c6bae2d9df15326c7ffbcf83b638acc6 update OEM driver list with new fujitsu and kyocera
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/sdk/1.6_r1/upgrading.jd | 1 | ||||
-rw-r--r-- | docs/html/sdk/android-3.0-highlights.jd | 2 | ||||
-rw-r--r-- | docs/html/sdk/ndk/index.jd | 16 |
3 files changed, 9 insertions, 10 deletions
diff --git a/docs/html/sdk/1.6_r1/upgrading.jd b/docs/html/sdk/1.6_r1/upgrading.jd index ebe6a95..49535c9 100644 --- a/docs/html/sdk/1.6_r1/upgrading.jd +++ b/docs/html/sdk/1.6_r1/upgrading.jd @@ -1,6 +1,5 @@ page.title=Upgrading the SDK sdk.version=1.6 -sdk.preview=0 @jd:body diff --git a/docs/html/sdk/android-3.0-highlights.jd b/docs/html/sdk/android-3.0-highlights.jd index ed49307..0378c35 100644 --- a/docs/html/sdk/android-3.0-highlights.jd +++ b/docs/html/sdk/android-3.0-highlights.jd @@ -129,7 +129,7 @@ This document provides a glimpse of some of the new features and technologies, a <p style="margin-top:1em;margin-bottom:.75em;"><strong>Camera and Gallery</strong></p> -<p>The Camera application has been redesigned to take advantage of a larger screen for quick access to exposure, focus, flash, zoom, front-facing camera, and more. To let users capture scenes in new ways, it adds built-in support for time-lapse video recording. Gallery application lets users view albums and other collections in full-screen mode, with easy access to thumbnails for other photos in the collection. </p> +<p>The Camera application has been redesigned to take advantage of a larger screen for quick access to exposure, focus, flash, zoom, front-facing camera, and more. To let users capture scenes in new ways, it adds built-in support for time-lapse video recording. The Gallery application lets users view albums and other collections in full-screen mode, with easy access to thumbnails for other photos in the collection. </p> <p style="margin-top:1em;margin-bottom:.75em;"><strong>Contacts</strong></p> diff --git a/docs/html/sdk/ndk/index.jd b/docs/html/sdk/ndk/index.jd index 2c3fd6a..2f53305 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-r5-windows.zip -ndk.win_bytes=62217450 -ndk.win_checksum=59cbb02d91d74e9c5c7278d94c989e80 +ndk.win_download=android-ndk-r5b-windows.zip +ndk.win_bytes=61299831 +ndk.win_checksum=87745ada305ab639399161ab4faf684c -ndk.mac_download=android-ndk-r5-darwin-x86.tar.bz2 +ndk.mac_download=android-ndk-r5b-darwin-x86.tar.bz2 ndk.mac_bytes=50210863 -ndk.mac_checksum=9dee8e4cb529a5619e9b8d1707478c32 +ndk.mac_checksum=019a14622a377b3727ec789af6707037 -ndk.linux_download=android-ndk-r5-linux-x86.tar.bz2 -ndk.linux_bytes=44362746 -ndk.linux_checksum=49d5c35ec02bafc074842542c58b7eb3 +ndk.linux_download=android-ndk-r5b-linux-x86.tar.bz2 +ndk.linux_bytes=44138539 +ndk.linux_checksum=4c0045ddc2bfd657be9d5177d0e0b7e7 page.title=Android NDK @jd:body |