summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Generate a valid main.py for use with developer.android.com.Trevor Johns2012-01-271-11/+12
* Merge "updating the SampleSyncAdapter sample to add stream item and photo cod...Robert Ly2012-01-275-8/+130
|\
| * updating the SampleSyncAdapter sample to add stream item and photo codeRobert Ly2012-01-235-8/+130
* | Add button to clear back stack.Dianne Hackborn2012-01-243-5/+26
|/
* Revert "updating the SampleSyncAdapter sample to add stream item and photo code"Robert Ly2012-01-205-128/+8
* updating the SampleSyncAdapter sample to add stream item and photo codeRobert Ly2012-01-195-8/+128
* Clean up and extend the linkify sample.Dianne Hackborn2012-01-133-49/+68
* Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1Jesse Hall2012-01-111-1/+3
|\
| * EmuGL: handle NULL data in glBufferDataJesse Hall2012-01-111-1/+3
* | Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1Xavier Ducrohet2012-01-111-1/+1
|\ \
| * | Move platform 15 sdk rev to 2. do not merge.Xavier Ducrohet2012-01-111-1/+1
* | | Merge "Doc change: updated index page for HDP sample." into ics-mr1Katie McCormick2012-01-111-1/+8
|\ \ \ | |_|/ |/| |
| * | Doc change: updated index page for HDP sample.Katie McCormick2012-01-061-1/+8
* | | Merge "Fix notification sample to follow current UI guidelines." into ics-mr1Dianne Hackborn2012-01-1110-57/+315
|\ \ \ | |_|/ |/| |
| * | Fix notification sample to follow current UI guidelines.Dianne Hackborn2012-01-1010-57/+315
* | | Merge "EmuGL: misc small cleanups" into ics-mr1Jesse Hall2012-01-096-20/+8
|\ \ \
| * | | EmuGL: misc small cleanupsJesse Hall2012-01-056-20/+8
* | | | Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1Jesse Hall2012-01-091-2/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | EmuGL: fix GL view position in window on OS XJesse Hall2012-01-041-2/+10
| | |/ | |/|
* / | docs: Allow d.a.c. to serve .OGVRoman Nurik2012-01-051-0/+4
|/ /
* / Allow d.a.c to serve webm and mp4Roman Nurik2011-12-221-0/+8
|/
* DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG filesRoman Nurik2011-12-201-0/+4
* Merge commit '71c1d3d8' into MR1 using -s oursXavier Ducrohet2011-12-150-0/+0
|\
| * Move platform component to rev3. do not merge.Xavier Ducrohet2011-12-151-1/+1
* | am 2d954623: Fix WXGA720 skin to be portrait by default. do not merge.Xavier Ducrohet2011-12-150-0/+0
|\|
| * Fix WXGA720 skin to be portrait by default. do not merge.Xavier Ducrohet2011-12-151-19/+19
* | Merge "Fix WXGA720 skin to be portrait by default." into ics-mr1Xavier Ducrohet2011-12-151-19/+19
|\ \
| * | Fix WXGA720 skin to be portrait by default.Xavier Ducrohet2011-12-151-19/+19
* | | am e9747521: Merge "Sample code for Android U lesson: Monetization - Ads with...Scott Main2011-12-1520-0/+739
|\ \ \ | | |/ | |/|
| * | Merge "Sample code for Android U lesson: Monetization - Ads without Compromis...Scott Main2011-12-1520-0/+739
| |\ \
| | * | Sample code for Android U lesson: Monetization - Ads without Compromising Use...Fred Chung2011-12-1320-0/+739
* | | | am d46d8577: Merge "Sample app for Android U lesson: Building apps for enterp...Scott Main2011-12-1516-0/+976
|\| | | | |_|/ |/| |
| * | Merge "Sample app for Android U lesson: Building apps for enterprise - Device...Scott Main2011-12-1516-0/+976
| |\ \
| | * | Sample app for Android U lesson: Building apps for enterprise - Device admini...Fred Chung2011-12-1416-0/+976
* | | | am 514d1cdb: Merge "revisions to NewsReader sample app for AndroidU. Clean up...Scott Main2011-12-1316-66/+116
|\| | |
| * | | Merge "revisions to NewsReader sample app for AndroidU. Clean up XML markup f...Scott Main2011-12-1316-66/+116
| |\ \ \ | | |_|/ | |/| |
| | * | revisions to NewsReader sample app for AndroidU.Scott Main2011-12-1216-66/+116
* | | | Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge.Raphael2011-12-122-1/+3
* | | | Merge "Move support lib to rev 6." into ics-mr1Xavier Ducrohet2011-12-121-1/+1
|\ \ \ \
| * | | | Move support lib to rev 6.Xavier Ducrohet2011-12-121-1/+1
* | | | | Merge "SDK only: add markup for use in documentation." into ics-mr1Dianne Hackborn2011-12-129-0/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | SDK only: add markup for use in documentation.Dianne Hackborn2011-12-129-0/+18
* | | | | am b0a30e43: EmuGL: remove broken EGL buffer refcountingJesse Hall2011-12-121-10/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | EmuGL: remove broken EGL buffer refcountingJesse Hall2011-12-121-10/+0
| | |/ / | |/| |
* | | | Move samples to API 15.Xavier Ducrohet2011-12-091-2/+2
* | | | Merge "Increase skin ram and vmheap." into ics-mr1Xavier Ducrohet2011-12-096-6/+10
|\ \ \ \
| * | | | Increase skin ram and vmheap.Xavier Ducrohet2011-12-096-6/+10
| | |/ / | |/| |
* | | | Revert "Revert "Update the media_profiles.xml file to include..."James Dong2011-12-091-1/+15
* | | | am 4ea24bff: cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec...Bruno Oliveira2011-12-0953-0/+1486
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063eBruno Oliveira2011-12-0953-0/+1486