summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2009-10-29 13:41:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 13:41:06 -0700
commite7672d0041f7d4093cac6db1233cd22b5cc45a01 (patch)
tree283bd5b8f247c87d13879940eafcc400bafadb71
parent9ac642a924a85d26fb093a0c4aa0a20817927935 (diff)
parent25aa87b2fdd065637cc87cb4b3e58b828aa29120 (diff)
downloadframeworks_base-e7672d0041f7d4093cac6db1233cd22b5cc45a01.zip
frameworks_base-e7672d0041f7d4093cac6db1233cd22b5cc45a01.tar.gz
frameworks_base-e7672d0041f7d4093cac6db1233cd22b5cc45a01.tar.bz2
am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 into eclair-sdk
Merge commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120' into eclair-mr2 * commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120': docs: add 2.0 video to developer site feature videos
-rw-r--r--docs/html/videos/index.jd6
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/html/videos/index.jd b/docs/html/videos/index.jd
index ddb9f86..4e53aac 100644
--- a/docs/html/videos/index.jd
+++ b/docs/html/videos/index.jd
@@ -37,12 +37,10 @@ var playlistsWithTitleInDescription = "734A052F802C96B9";
* Each playlist ID is paired with a custom video description.
*/
var featured = {
-// Android 1.6 Release
- 'MBRFkLKRwFw' : "The Android 1.6 release includes new features and improvements to the Android platform. Here's an introduction to what's new in Android 1.6.",
+// Android 2.0 Release
+ 'opZ69P-0Jbc' : "The Android 2.0 platform adds exciting new user features and developer APIs. Here's an introduction to what's new.",
// How to Make your Android UI Fast..
'N6YdwzAvwOA' : "Make your user interface fast, with more efficient AdapterViews, better bitmap scaling, faster redrawing, ViewStub layouts, fewer Views, and more.",
-// Coding for Life: Battery Life
-// 'OUemfrKe65c' : "Learn what kinds of operations consume the most battery and how you can reduce your usage, with tips for parsing and zipping data, using wakelocks, and running a Service.",
// How Do I Code Thee?
'GARMe7Km_gk' : "If you'd like to augment your Android applications with pieces written in JavaScript or native code, watch this video."
};