summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | am e292086: Merge change 1391 into donutAndroid (Google) Code Review2009-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge change 1391 into donutAndroid (Google) Code Review2009-05-110-0/+0
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ merged 25fdf35, resolved conflictsGuang Zhu2009-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge change 1299 into donutAndroid (Google) Code Review2009-05-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | am 7f2ae49: Merge change 1370 into donutAndroid (Google) Code Review2009-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge change 1370 into donutAndroid (Google) Code Review2009-05-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ am 3b30d80: Merge change 1377 into donutAndroid (Google) Code Review2009-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge change 1377 into donutAndroid (Google) Code Review2009-05-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | am 6ee44d1: Merge change 1258 into donutAndroid (Google) Code Review2009-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge change 1258 into donutAndroid (Google) Code Review2009-05-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| * | | | | | | | | | | | am 1655be4: Fix issue #1837610 and #1753079Dianne Hackborn2009-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge change 720Android (Google) Code Review2009-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 5e1d8ae: Merge change 1355 into donutAndroid (Google) Code Review2009-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge change 1355 into donutAndroid (Google) Code Review2009-05-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge change 1324Android (Google) Code Review2009-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3022a11: Merge change 1239 into donutAndroid (Google) Code Review2009-05-115-229/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge change 1239 into donutAndroid (Google) Code Review2009-05-115-229/+81
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Modify camera framework to use new streamlined binder interface.Dave Sparks2009-05-115-229/+81
| | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | | am 82e61c9: Merge change 1316 into donutAndroid (Google) Code Review2009-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge change 1316 into donutAndroid (Google) Code Review2009-05-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | / / / / / / | | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | |
| * | | | | | | | | | | | | am b4735b6: am 25f9637: AI 148665: Disabling a test that does not work aJorg Pleumann2009-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 25f9637: AI 148665: Disabling a test that does not work asJorg Pleumann2009-05-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | / / | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | am 8331f72: remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "Mathias Agopian2009-05-084-15/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "extension" fro eg...Mathias Agopian2009-05-084-15/+37
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | am 2accb31: this should fix the buildMathias Agopian2009-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | am 778fb15: should fix the build.Mathias Agopian2009-05-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | should fix the build.Mathias Agopian2009-05-081-1/+1
| * | | | | | | | | | | am 3a04bd3: Merge change 1289 into donutAndroid (Google) Code Review2009-05-085-4/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge change 1289 into donutAndroid (Google) Code Review2009-05-085-4/+14
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | only export the GL entry-points, hide everything else.Mathias Agopian2009-05-085-4/+14
| | |/ / / / / / / / /
| * | | | | | | | | | am 851a541: Implement targetSdkVersion and maxSdkVersion, plus version cDianne Hackborn2009-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | am ed3b804: Merge change 1276 into donutAndroid (Google) Code Review2009-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge change 1276 into donutAndroid (Google) Code Review2009-05-080-0/+0
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ am c39aae0: Merge change 1278 into donutAndroid (Google) Code Review2009-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge change 1278 into donutAndroid (Google) Code Review2009-05-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| * | | | | | | | | | | am 7b59fe3: Merge change 1275 into donutAndroid (Google) Code Review2009-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge change 1275 into donutAndroid (Google) Code Review2009-05-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | / / / / / | | | | |_|_|/ / / / / | | | |/| | | | | | |
| * | | | | | | | | | merged 98acd54, resolved conflictsMike LeBeau2009-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | merge 55280a9The Android Open Source Project2009-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
* | | | | | | | | | | Merge commit 'goog/master' into merge_masterMathias Agopian2009-05-0812-50/+145
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 672f1e2: Merge change 1192 into donutAndroid (Google) Code Review2009-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge change 1192 into donutAndroid (Google) Code Review2009-05-080-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| * | | | | | | | | | manual merge 3a6645aThe Android Open Source Project2009-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge change 1114 into donutAndroid (Google) Code Review2009-05-080-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| * | | | | | | | | | am 17a5e5d: Merge change 1217 into donutAndroid (Google) Code Review2009-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge change 1217 into donutAndroid (Google) Code Review2009-05-080-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | am c825d3e: fix the sim build. disables the tests for now.Joe Onorato2009-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | fix the sim build. disables the tests for now.Joe Onorato2009-05-082-2/+4
| * | | | | | | | | | manual merge of 1e09a72The Android Open Source Project2009-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/fram...The Android Open Source Project2009-05-070-0/+0
| | |\ \ \ \ \ \ \ \ \