summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge change 23787 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\
* \ Merge change 23782 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ | |/
* | Merge change 23774 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|/
* Merge change 23607 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\
* \ am b6b25d63: Merge change 23126 into donutScott Main2009-09-020-0/+0
|\ \
| * \ Merge change 23126 into donutAndroid (Google) Code Review2009-09-020-0/+0
| |\ \
* | \ \ Merge change 23765 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \
* \ \ \ \ am 2a2058f5: Merge change 23762 into donutDirk Dougherty2009-09-020-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge change 23762 into donutAndroid (Google) Code Review2009-09-020-0/+0
* | | | | am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manual...Dirk Dougherty2009-09-020-0/+0
|\ \ \ \ \ | |/ / / /
* | | | | Merge change 23584 into eclairAndroid (Google) Code Review2009-09-022-0/+104
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Simple app to create a gl2 context and dump the strings.Jason Sams2009-09-012-0/+104
* | | | | Merge change 23751 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \
* \ \ \ \ \ am 96b7f921: Merge change 23565 into donutScott Main2009-09-020-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge change 23565 into donutAndroid (Google) Code Review2009-09-020-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge change 23704 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \
* \ \ \ \ \ Merge change 23693 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge change 23738 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge change 23568 into eclairAndroid (Google) Code Review2009-09-021-5/+12
|\ \ \ \ \ \ \
| * | | | | | | Work on issue #2079167: Flickering issue across multiple UIDianne Hackborn2009-09-021-5/+12
* | | | | | | | Merge change 23720 into eclairAndroid (Google) Code Review2009-09-023-4/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add colorkey to gl clear operationRebecca Schultz Zavin2009-09-023-4/+17
* | | | | | | | Merge change 23698 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge change 23690 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge change 23723 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge change 23717 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge change 23646 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ am d3db17d8: Merge snapshot version of donut back into the main treeJean-Baptiste Queru2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge snapshot version of donut back into the main treeJean-Baptiste Queru2009-09-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ am e1b4437d: Revert "Fix content provider"Dianne Hackborn2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge change 23510 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | / / / / / / / / | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge change 23652 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge change 23669 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge change 23667 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge change 23548 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge change 23643 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge change 23323 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge change 23529 into eclairAndroid (Google) Code Review2009-09-021-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.Eric Fischer2009-09-011-1/+10
* | | | | | | | | | | | | Merge change 23632 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge change 23631 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge change 23539 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| / / / / / / / / / / | |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge change 23527 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | / / / / | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge change 23609 into eclairAndroid (Google) Code Review2009-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge change 23585 into eclairAndroid (Google) Code Review2009-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge change 23425 into eclairAndroid (Google) Code Review2009-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
* | | | | | | | | | | | Merge change 23582 into eclairAndroid (Google) Code Review2009-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge change 23583 into eclairAndroid (Google) Code Review2009-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge change 23463 into eclairAndroid (Google) Code Review2009-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | am c804efe2: Merge change 23569 into donutDianne Hackborn2009-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |