Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | am e292086: Merge change 1391 into donut | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge change 1391 into donut | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ | merged 25fdf35, resolved conflicts | Guang Zhu | 2009-05-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge change 1299 into donut | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | am 7f2ae49: Merge change 1370 into donut | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge change 1370 into donut | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ \ | am 3b30d80: Merge change 1377 into donut | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge change 1377 into donut | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | am 6ee44d1: Merge change 1258 into donut | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge change 1258 into donut | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | | am 1655be4: Fix issue #1837610 and #1753079 | Dianne Hackborn | 2009-05-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge change 720 | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | am 5e1d8ae: Merge change 1355 into donut | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge change 1355 into donut | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ | Merge change 1324 | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 3022a11: Merge change 1239 into donut | Android (Google) Code Review | 2009-05-11 | 5 | -229/+81 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge change 1239 into donut | Android (Google) Code Review | 2009-05-11 | 5 | -229/+81 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Modify camera framework to use new streamlined binder interface. | Dave Sparks | 2009-05-11 | 5 | -229/+81 | |
| | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | am 82e61c9: Merge change 1316 into donut | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Merge change 1316 into donut | Android (Google) Code Review | 2009-05-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | / / / / / / | | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | am b4735b6: am 25f9637: AI 148665: Disabling a test that does not work a | Jorg Pleumann | 2009-05-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | am 25f9637: AI 148665: Disabling a test that does not work as | Jorg Pleumann | 2009-05-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | / / | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | am 8331f72: remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() " | Mathias Agopian | 2009-05-08 | 4 | -15/+37 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "extension" fro eg... | Mathias Agopian | 2009-05-08 | 4 | -15/+37 | |
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | am 2accb31: this should fix the build | Mathias Agopian | 2009-05-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | am 778fb15: should fix the build. | Mathias Agopian | 2009-05-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | should fix the build. | Mathias Agopian | 2009-05-08 | 1 | -1/+1 | |
| * | | | | | | | | | | | am 3a04bd3: Merge change 1289 into donut | Android (Google) Code Review | 2009-05-08 | 5 | -4/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge change 1289 into donut | Android (Google) Code Review | 2009-05-08 | 5 | -4/+14 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | only export the GL entry-points, hide everything else. | Mathias Agopian | 2009-05-08 | 5 | -4/+14 | |
| | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | am 851a541: Implement targetSdkVersion and maxSdkVersion, plus version c | Dianne Hackborn | 2009-05-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | am ed3b804: Merge change 1276 into donut | Android (Google) Code Review | 2009-05-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge change 1276 into donut | Android (Google) Code Review | 2009-05-08 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ | am c39aae0: Merge change 1278 into donut | Android (Google) Code Review | 2009-05-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge change 1278 into donut | Android (Google) Code Review | 2009-05-08 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | | am 7b59fe3: Merge change 1275 into donut | Android (Google) Code Review | 2009-05-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge change 1275 into donut | Android (Google) Code Review | 2009-05-08 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | / / / / / | | | | |_|_|/ / / / / | | | |/| | | | | | | | ||||||
| * | | | | | | | | | | merged 98acd54, resolved conflicts | Mike LeBeau | 2009-05-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | merge 55280a9 | The Android Open Source Project | 2009-05-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
* | | | | | | | | | | | Merge commit 'goog/master' into merge_master | Mathias Agopian | 2009-05-08 | 12 | -50/+145 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 672f1e2: Merge change 1192 into donut | Android (Google) Code Review | 2009-05-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge change 1192 into donut | Android (Google) Code Review | 2009-05-08 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | ||||||
| * | | | | | | | | | | manual merge 3a6645a | The Android Open Source Project | 2009-05-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge change 1114 into donut | Android (Google) Code Review | 2009-05-08 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | ||||||
| * | | | | | | | | | | am 17a5e5d: Merge change 1217 into donut | Android (Google) Code Review | 2009-05-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge change 1217 into donut | Android (Google) Code Review | 2009-05-08 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | am c825d3e: fix the sim build. disables the tests for now. | Joe Onorato | 2009-05-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | fix the sim build. disables the tests for now. | Joe Onorato | 2009-05-08 | 2 | -2/+4 | |
| * | | | | | | | | | | manual merge of 1e09a72 | The Android Open Source Project | 2009-05-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/fram... | The Android Open Source Project | 2009-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ |