summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-12-16Reconcile with ics-mr1-releaseHEADmasterThe Android Open Source Project0-0/+0
2011-12-16am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview.Dirk Dougherty2-8/+7
2011-12-16Doc change: edits to ICS MR1 API Overview.Dirk Dougherty2-8/+7
2011-12-16am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Sup...Joe Fernandez2-62/+72
2011-12-16Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r...Joe Fernandez2-62/+72
2011-12-16docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6Joe Fernandez2-62/+72
2011-12-16am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites an...Fred Chung2-4/+2
2011-12-16am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.Fred Chung2-4/+2
2011-12-16Fixed Android U Enterprise lesson pre-requisites and a minor typo.Fred Chung2-4/+2
2011-12-16am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Suppor...Scott Main4-29/+131
2011-12-16Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" ...Scott Main4-29/+131
2011-12-16am 36c67785: docs: update homepage for 4.0.3 announcmentScott Main1-8/+8
2011-12-16docs: update homepage for 4.0.3 announcmentScott Main1-8/+8
2011-12-16SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis1-1/+3
2011-12-16merge in ics-mr1-release history after reset to ics-mr1The Android Automerger0-0/+0
2011-12-16am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not...Scott Main4-4/+4
2011-12-16am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)Scott Main4-4/+4
2011-12-16SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis1-1/+3
2011-12-16docs: fix encoding issue or whatever with docs (not showing titles)Scott Main4-4/+4
2011-12-16am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" in...Scott Main1-0/+19
2011-12-16am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0Scott Main1-0/+19
2011-12-16Merge "docs: add remembering users class to nav" into ics-mr0Scott Main1-0/+19
2011-12-16am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Iden...Scott Main5-31/+31
2011-12-16am 5dac1976: Merge "Doc merge from master:Training class on Identifying and A...Scott Main5-31/+31
2011-12-16docs: add remembering users class to navScott Main1-0/+19
2011-12-16Merge "Doc merge from master:Training class on Identifying and Authenticating...Scott Main5-31/+31
2011-12-16am ce5643c7: am abfcbd16: docs: typo in training orientationScott Main1-5/+5
2011-12-16am abfcbd16: docs: typo in training orientationScott Main1-5/+5
2011-12-16Doc merge from master:Training class on Identifying and Authenticating Users.Dirk Dougherty5-31/+31
2011-12-16docs: typo in training orientationScott Main1-5/+5
2011-12-16am 1584a816: am 408f94b1: Merge "docs: Minor bugfix to Android U navigation d...Roman Nurik1-1/+1
2011-12-16am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" ...Roman Nurik1-1/+1
2011-12-16am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ic...Dave Burke1-1/+3
2011-12-16Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1Dave Burke1-1/+3
2011-12-16Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0Roman Nurik1-1/+1
2011-12-16docs: Minor bugfix to Android U navigation design classRoman Nurik1-1/+1
2011-12-16SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis1-1/+3
2011-12-16am aeb06e34: am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some ...Scott Main5-10/+10
2011-12-16am 5f0df1b8: am 580f0146: docs: add camera and design, remove users update ti...Scott Main29-56/+88
2011-12-16am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wordin...Scott Main5-10/+10
2011-12-16am 580f0146: docs: add camera and design, remove users update title names for...Scott Main29-56/+88
2011-12-16Merge "Minor tweaks to Sharing class, updated some typos, wording and a scree...Scott Main5-10/+10
2011-12-16docs: add camera and design, remove usersScott Main29-56/+88
2011-12-16am ea627994: am fc3f8e69: Merge "Remove references to sample application" int...Sparky Rhode2-37/+16
2011-12-16am fc3f8e69: Merge "Remove references to sample application" into ics-mr0Sparky Rhode2-37/+16
2011-12-16Merge "Remove references to sample application" into ics-mr0Sparky Rhode2-37/+16
2011-12-16docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6Joe Fernandez4-29/+131
2011-12-16Remove references to sample applicationSparky Rhode2-37/+16
2011-12-16am eb623347: am d37e2b35: Merge "Android U Class: Designing Effective and Int...Roman Nurik32-0/+4488
2011-12-16am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Na...Roman Nurik32-0/+4488