| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'ics-mr1' of https://android.googlesource.com/platform/framework... | Steve Kondik | 2011-12-16 | 1816 | -14829/+107895 |
|\ |
|
| * | Doc change: edits to ICS MR1 API Overview. | Dirk Dougherty | 2011-12-16 | 2 | -8/+7 |
| * | Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r... | Joe Fernandez | 2011-12-15 | 2 | -62/+72 |
| |\ |
|
| | * | docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6 | Joe Fernandez | 2011-12-15 | 2 | -62/+72 |
| * | | am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. | Fred Chung | 2011-12-15 | 2 | -4/+2 |
| |\ \
| | |/
| |/| |
|
| | * | Fixed Android U Enterprise lesson pre-requisites and a minor typo. | Fred Chung | 2011-12-15 | 2 | -4/+2 |
| * | | Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" ... | Scott Main | 2011-12-15 | 4 | -29/+131 |
| |\ \ |
|
| | * | | docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6 | Joe Fernandez | 2011-12-15 | 4 | -29/+131 |
| * | | | docs: update homepage for 4.0.3 announcment | Scott Main | 2011-12-15 | 1 | -8/+8 |
| * | | | am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) | Scott Main | 2011-12-15 | 4 | -4/+4 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | docs: fix encoding issue or whatever with docs (not showing titles) | Scott Main | 2011-12-15 | 4 | -4/+4 |
| * | | | am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 | Scott Main | 2011-12-15 | 1 | -0/+19 |
| |\ \ \
| | |/ / |
|
| | * | | Merge "docs: add remembering users class to nav" into ics-mr0 | Scott Main | 2011-12-15 | 1 | -0/+19 |
| | |\ \ |
|
| | | * | | docs: add remembering users class to nav | Scott Main | 2011-12-15 | 1 | -0/+19 |
| * | | | | am 5dac1976: Merge "Doc merge from master:Training class on Identifying and A... | Scott Main | 2011-12-15 | 5 | -31/+31 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | Merge "Doc merge from master:Training class on Identifying and Authenticating... | Scott Main | 2011-12-15 | 5 | -31/+31 |
| | |\ \ \
| | | |/ /
| | |/| | |
|
| | | * | | Doc merge from master:Training class on Identifying and Authenticating Users. | Dirk Dougherty | 2011-12-15 | 5 | -31/+31 |
| * | | | | am abfcbd16: docs: typo in training orientation | Scott Main | 2011-12-15 | 1 | -5/+5 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | docs: typo in training orientation | Scott Main | 2011-12-15 | 1 | -5/+5 |
| * | | | | am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" ... | Roman Nurik | 2011-12-15 | 1 | -1/+1 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0 | Roman Nurik | 2011-12-15 | 1 | -1/+1 |
| | |\ \ \
| | | |/ /
| | |/| | |
|
| | | * | | docs: Minor bugfix to Android U navigation design class | Roman Nurik | 2011-12-15 | 1 | -1/+1 |
| * | | | | Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 | Dave Burke | 2011-12-15 | 1 | -1/+3 |
| |\ \ \ \ |
|
| | * | | | | SurfaceMediaSource: use the HW_TEXTURE usage bit | Jamie Gennis | 2011-12-15 | 1 | -1/+3 |
| * | | | | | am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wordin... | Scott Main | 2011-12-15 | 5 | -10/+10 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | Merge "Minor tweaks to Sharing class, updated some typos, wording and a scree... | Scott Main | 2011-12-15 | 5 | -10/+10 |
| | |\ \ \ \ |
|
| | | * | | | | Minor tweaks to Sharing class, updated some typos, wording and a screenshot. | Adam Koch | 2011-12-15 | 5 | -10/+10 |
| * | | | | | | am 580f0146: docs: add camera and design, remove users update title names for... | Scott Main | 2011-12-15 | 29 | -56/+88 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | docs: add camera and design, remove users | Scott Main | 2011-12-15 | 29 | -56/+88 |
| * | | | | | | am fc3f8e69: Merge "Remove references to sample application" into ics-mr0 | Sparky Rhode | 2011-12-15 | 2 | -37/+16 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | Merge "Remove references to sample application" into ics-mr0 | Sparky Rhode | 2011-12-15 | 2 | -37/+16 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Remove references to sample application | Sparky Rhode | 2011-12-15 | 2 | -37/+16 |
| * | | | | | | | am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Na... | Roman Nurik | 2011-12-15 | 32 | -0/+4488 |
| |\ \ \ \ \ \ \
| | |/ / / / / / |
|
| | * | | | | | | Merge "Android U Class: Designing Effective and Intuitive App Navigation" int... | Roman Nurik | 2011-12-15 | 32 | -0/+4488 |
| | |\ \ \ \ \ \
| | | |/ / / / /
| | |/| | | / /
| | | | |_|/ /
| | | |/| | | |
|
| | | * | | | | Android U Class: Designing Effective and Intuitive App Navigation | Roman Nurik | 2011-12-15 | 32 | -0/+4488 |
| | | |/ / / |
|
| * | | | | | am 2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes"... | Scott Main | 2011-12-15 | 9 | -6/+212 |
| |\ \ \ \ \
| | |/ / / / |
|
| | * | | | | Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0 | Scott Main | 2011-12-15 | 9 | -6/+212 |
| | |\ \ \ \ |
|
| | | * | | | | docs: Add training homepage, side nav, and title changes | Scott Main | 2011-12-15 | 9 | -6/+212 |
| * | | | | | | am 564e8aa4: docs: Android University - Camera class | Scott Main | 2011-12-15 | 5 | -0/+744 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | docs: Android University - Camera class | Scott Main | 2011-12-15 | 5 | -0/+744 |
| | |/ / / / |
|
| * | | | | | am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change... | Scott Main | 2011-12-15 | 0 | -0/+0 |
| |\ \ \ \ \
| | |/ / / / |
|
| | * | | | | cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cd... | Scott Main | 2011-12-15 | 2 | -13/+12 |
| | |/ / / |
|
| * | | | | docs: remove some "new" tags from side navs | Scott Main | 2011-12-15 | 2 | -13/+12 |
| | |/ /
| |/| | |
|
| * | | | am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Ex... | Scott Main | 2011-12-15 | 9 | -0/+306 |
| |\ \ \
| | |/ / |
|
| | * | | Android U Class: Monetization / Ads without Compromising User Experience | Scott Main | 2011-12-15 | 9 | -0/+306 |
| * | | | am aed4ced6: Android U Class: Developing Android Applications for the Enterpr... | Scott Main | 2011-12-15 | 6 | -1/+285 |
| |\ \ \
| | |/ / |
|
| | * | | Android U Class: Developing Android Applications for the Enterprise. | Scott Main | 2011-12-15 | 6 | -1/+285 |
| * | | | am f9cca66e: Docs: Training class on Identifying and Authenticating Users. | Scott Main | 2011-12-15 | 4 | -0/+640 |
| |\ \ \
| | |/ / |
|
| | * | | Docs: Training class on Identifying and Authenticating Users. | Scott Main | 2011-12-15 | 4 | -0/+640 |
| * | | | Merge "Fix some java docs." into ics-mr1 | Dianne Hackborn | 2011-12-14 | 1 | -9/+9 |
| |\ \ \ |
|