summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ics-mr1' of https://android.googlesource.com/platform/framework...Steve Kondik2011-12-161816-14829/+107895
|\
| * Doc change: edits to ICS MR1 API Overview.Dirk Dougherty2011-12-162-8/+7
| * Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r...Joe Fernandez2011-12-152-62/+72
| |\
| | * docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6Joe Fernandez2011-12-152-62/+72
| * | am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.Fred Chung2011-12-152-4/+2
| |\ \ | | |/ | |/|
| | * Fixed Android U Enterprise lesson pre-requisites and a minor typo.Fred Chung2011-12-152-4/+2
| * | Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" ...Scott Main2011-12-154-29/+131
| |\ \
| | * | docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6Joe Fernandez2011-12-154-29/+131
| * | | docs: update homepage for 4.0.3 announcmentScott Main2011-12-151-8/+8
| * | | am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)Scott Main2011-12-154-4/+4
| |\ \ \ | | | |/ | | |/|
| | * | docs: fix encoding issue or whatever with docs (not showing titles)Scott Main2011-12-154-4/+4
| * | | am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0Scott Main2011-12-151-0/+19
| |\ \ \ | | |/ /
| | * | Merge "docs: add remembering users class to nav" into ics-mr0Scott Main2011-12-151-0/+19
| | |\ \
| | | * | docs: add remembering users class to navScott Main2011-12-151-0/+19
| * | | | am 5dac1976: Merge "Doc merge from master:Training class on Identifying and A...Scott Main2011-12-155-31/+31
| |\ \ \ \ | | |/ / /
| | * | | Merge "Doc merge from master:Training class on Identifying and Authenticating...Scott Main2011-12-155-31/+31
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Doc merge from master:Training class on Identifying and Authenticating Users.Dirk Dougherty2011-12-155-31/+31
| * | | | am abfcbd16: docs: typo in training orientationScott Main2011-12-151-5/+5
| |\ \ \ \ | | |/ / /
| | * | | docs: typo in training orientationScott Main2011-12-151-5/+5
| * | | | am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" ...Roman Nurik2011-12-151-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0Roman Nurik2011-12-151-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | docs: Minor bugfix to Android U navigation design classRoman Nurik2011-12-151-1/+1
| * | | | Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1Dave Burke2011-12-151-1/+3
| |\ \ \ \
| | * | | | SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
| * | | | | am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wordin...Scott Main2011-12-155-10/+10
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Minor tweaks to Sharing class, updated some typos, wording and a scree...Scott Main2011-12-155-10/+10
| | |\ \ \ \
| | | * | | | Minor tweaks to Sharing class, updated some typos, wording and a screenshot.Adam Koch2011-12-155-10/+10
| * | | | | | am 580f0146: docs: add camera and design, remove users update title names for...Scott Main2011-12-1529-56/+88
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | docs: add camera and design, remove usersScott Main2011-12-1529-56/+88
| * | | | | | am fc3f8e69: Merge "Remove references to sample application" into ics-mr0Sparky Rhode2011-12-152-37/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Remove references to sample application" into ics-mr0Sparky Rhode2011-12-152-37/+16
| | |\ \ \ \ \
| | | * | | | | Remove references to sample applicationSparky Rhode2011-12-152-37/+16
| * | | | | | | am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Na...Roman Nurik2011-12-1532-0/+4488
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Android U Class: Designing Effective and Intuitive App Navigation" int...Roman Nurik2011-12-1532-0/+4488
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | | | |_|/ / | | | |/| | |
| | | * | | | Android U Class: Designing Effective and Intuitive App NavigationRoman Nurik2011-12-1532-0/+4488
| | | |/ / /
| * | | | | am 2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes"...Scott Main2011-12-159-6/+212
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0Scott Main2011-12-159-6/+212
| | |\ \ \ \
| | | * | | | docs: Add training homepage, side nav, and title changesScott Main2011-12-159-6/+212
| * | | | | | am 564e8aa4: docs: Android University - Camera classScott Main2011-12-155-0/+744
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | docs: Android University - Camera classScott Main2011-12-155-0/+744
| | |/ / / /
| * | | | | am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change...Scott Main2011-12-150-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cd...Scott Main2011-12-152-13/+12
| | |/ / /
| * | | | docs: remove some "new" tags from side navsScott Main2011-12-152-13/+12
| | |/ / | |/| |
| * | | am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Ex...Scott Main2011-12-159-0/+306
| |\ \ \ | | |/ /
| | * | Android U Class: Monetization / Ads without Compromising User ExperienceScott Main2011-12-159-0/+306
| * | | am aed4ced6: Android U Class: Developing Android Applications for the Enterpr...Scott Main2011-12-156-1/+285
| |\ \ \ | | |/ /
| | * | Android U Class: Developing Android Applications for the Enterprise.Scott Main2011-12-156-1/+285
| * | | am f9cca66e: Docs: Training class on Identifying and Authenticating Users.Scott Main2011-12-154-0/+640
| |\ \ \ | | |/ /
| | * | Docs: Training class on Identifying and Authenticating Users.Scott Main2011-12-154-0/+640
| * | | Merge "Fix some java docs." into ics-mr1Dianne Hackborn2011-12-141-9/+9
| |\ \ \