summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Build software AGL library with correct get_tls() macro for ARMv7 based platf...Magnus Landqvist2010-02-191-0/+4
* Merge "Use a circular buffer in VelocityTracker"Adam Powell2010-02-050-0/+0
|\
* | Merge "Fix x coordinate of the ACTION_UP event in TouchUtils.drag() method"Romain Guy2010-02-050-0/+0
|/
* Merge change I700e6d4dAndroid Code Review2009-12-210-0/+0
* merge from eclairJean-Baptiste Queru2009-11-15302-18305/+24694
|\
| * eclair snapshotJean-Baptiste Queru2009-11-13303-18187/+24710
* | Merge change I83387a48Android Code Review2009-11-100-0/+0
|\ \
* \ \ Merge change Ia01d5fe8Android Code Review2009-11-080-0/+0
|\ \ \
* \ \ \ Merge change I4a783af6Android Code Review2009-11-051-1/+1
|\ \ \ \
| * | | | Fix obvious typo bug in egl.cppChristoffer Gurell2009-10-121-1/+1
* | | | | Merge change I8f67f092Android Code Review2009-11-050-0/+0
|\ \ \ \ \
* \ \ \ \ \ Merge change Ifcba56d2Android Code Review2009-11-051-29/+35
|\ \ \ \ \ \
| * | | | | | Capture failure of copybit->stretch()Ravi K Yenduri2009-11-051-29/+35
| | |/ / / / | |/| | | |
* | | | | | Merge change I9ff67a5fAndroid Code Review2009-11-050-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
* | | | | Merge change Ic93ca0d7Android Code Review2009-11-041-1/+1
|\ \ \ \ \
| * | | | | Don't return when blocking is true.Li Wenhao2009-09-211-1/+1
| |/ / / /
* | | | | Merge from donutJean-Baptiste Queru2009-10-280-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| | | | |
| | \ \ \
| *-. \ \ \ Reconcile true history with open-source donut snapshotsJean-Baptiste Queru2009-10-280-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge change 23569 into donutAndroid (Google) Code Review2009-09-010-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge change 23499 into donutAndroid (Google) Code Review2009-09-010-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Merge change 23503 into donutAndroid (Google) Code Review2009-09-010-0/+0
| | |/ / / / /
| | * | | | | Merge change 23345 into donutAndroid (Google) Code Review2009-09-010-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge change 23242 into donutAndroid (Google) Code Review2009-08-310-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge snapshot version of donut back into the main treeJean-Baptiste Queru2009-08-310-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | | |/ / / /
| | * | | | | Merge change 23241 into donutAndroid (Google) Code Review2009-08-290-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge change 23198 into donutAndroid (Google) Code Review2009-08-280-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge change 23173 into donutAndroid (Google) Code Review2009-08-280-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge change 23043 into donutAndroid (Google) Code Review2009-08-270-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Merge change 22939 into donutAndroid (Google) Code Review2009-08-270-0/+0
| | |\ \ \ \ \ \
| | * | | | | | | Merge change 22883 into donutAndroid (Google) Code Review2009-08-270-0/+0
| | |/ / / / / /
| | * | | | | | Merge change 22090 into donutAndroid (Google) Code Review2009-08-260-0/+0
| | |/ / / / /
| | * | | | | Merge change 22379 into donutAndroid (Google) Code Review2009-08-240-0/+0
| | |\ \ \ \ \
| | * | | | | | Merge change 22322 into donutAndroid (Google) Code Review2009-08-210-0/+0
| | * | | | | | Merge change 21977 into donutAndroid (Google) Code Review2009-08-200-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge change 21772 into donutAndroid (Google) Code Review2009-08-180-0/+0
| | * | | | | | Merge change 21652 into donutAndroid (Google) Code Review2009-08-170-0/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge change 21178 into donutAndroid (Google) Code Review2009-08-170-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge change 21408 into donutAndroid (Google) Code Review2009-08-170-0/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge change 21572 into donutAndroid (Google) Code Review2009-08-170-0/+0
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Merge change 21549 into donutAndroid (Google) Code Review2009-08-170-0/+0
| | |/ / / / / / / /
| | * | | | | | | | Merge change 21358 into donutAndroid (Google) Code Review2009-08-140-0/+0
| | |/ / / / / / /
| | * | | | | | | Merge change 21241 into donutAndroid (Google) Code Review2009-08-140-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge change 21226 into donutAndroid (Google) Code Review2009-08-140-0/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge change 21124 into donutAndroid (Google) Code Review2009-08-140-0/+0
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge change 21149 into donutAndroid (Google) Code Review2009-08-130-0/+0
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge change 21100 into donutAndroid (Google) Code Review2009-08-130-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge change 21063 into donutAndroid (Google) Code Review2009-08-130-0/+0
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge change 21033 into donutAndroid (Google) Code Review2009-08-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | / / / / / / / / | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge change 21055 into donutAndroid (Google) Code Review2009-08-120-0/+0
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge change 21045 into donutAndroid (Google) Code Review2009-08-120-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |