summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-070-0/+0
|\
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-060-0/+0
| |\
* | \ am ea916557: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-070-0/+0
|\ \ \
| * \ \ Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-070-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-040-0/+0
| | |\ \
* | | \ \ Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-010-0/+0
| |\ \ \ \
| | * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-300-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-260-0/+0
| | | |\ \ \ \
| | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-230-0/+0
| | | | |\ \ \ \
| | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-200-0/+0
| | | | | |\ \ \ \
| | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-190-0/+0
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-180-0/+0
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-160-0/+0
| | | | | | | | |\ \ \ \
| | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-130-0/+0
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * | | | Revert "Support "Vertical Writing Mode"."John Reck2011-10-126-61/+16
| | | | | | | | | | * | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-120-0/+0
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-110-0/+0
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-090-0/+0
| | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-050-0/+0
| | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-040-0/+0
| | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-030-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-300-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-270-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-250-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | * | | | Discard BaseTileTextures entirely when they delete their GL texturesChris Craik2011-09-221-7/+1
| | | | | | | | | | | | | | | | | | | | | | * | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | Fix layer tile allocation to be more consistent, less discoChris Craik2011-09-134-17/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | If unlock base layer marks tiles dirty, repaintChris Craik2011-09-094-22/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | Stop layer tile flickeringChris Craik2011-09-091-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | Roll back fix for http://b/issue?id=4203823Ben Murdoch2011-09-081-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | Fix old textures not being repaintedChris Craik2011-09-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-08-310-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \