Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | am 60f3eb5: Merge branch \'donut\' of ssh://android-git.corp.google.com:29 | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | | am b59f23d: Merge branch \'donut\' of ssh://android-git.corp.google.com:29 | The Android Open Source Project | 2009-05-08 | 1 | -19/+48 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/fram... | The Android Open Source Project | 2009-05-07 | 1 | -19/+48 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | Require native-order direct buffers for glXXXPointer APIs. | Jack Palevich | 2009-05-07 | 1 | -19/+48 | |
| * | | | | | | | | | | | am 3fd7e13: Merge branch \'donut\' of ssh://android-git.corp.google.com:29 | The Android Open Source Project | 2009-05-08 | 4 | -0/+76 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/fram... | The Android Open Source Project | 2009-05-07 | 4 | -0/+76 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | Merge change 1164 into donut | Android (Google) Code Review | 2009-05-07 | 4 | -0/+76 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | Add new binder methods to camera client to support generic callbacks | Dave Sparks | 2009-05-07 | 4 | -0/+76 | |
| * | | | | | | | | | | | | am 8705a41: Merge branch \'donut\' of ssh://android-git.corp.google.com:29 | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | Merge change 1108 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | \ \ \ \ \ \ \ \ \ \ | am c664d18: Merge branch \'donut\' of ssh://android-git.corp.google.com:29 | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | Merge change 760 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | \ \ \ \ \ \ \ \ \ \ \ | am 572ae14: Merge branch \'donut\' of ssh://android-git.corp.google.com:29 | The Android Open Source Project | 2009-05-08 | 7 | -31/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/fram... | The Android Open Source Project | 2009-05-07 | 7 | -31/+21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | Merge change 1163 into donut | Android (Google) Code Review | 2009-05-07 | 7 | -31/+21 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | Fix automatically generated code for glGet | Jack Palevich | 2009-05-07 | 7 | -31/+21 | |
| | | | | |_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | | | manual merge of 7ec32cc | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | am 5085ef6: Merge branch \'donut\' of ssh://android-git.corp.google.com:29 | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | am b6868d0: am 9b825aa: AI 148470: add documentation about aapt image op | Scott Main | 2009-05-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | am 9b825aa: AI 148470: add documentation about aapt image optimization | Scott Main | 2009-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | / / / / / | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge commit 'goog/master' into merge_master | Mathias Agopian | 2009-05-07 | 3 | -1/+699 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am fedf566: Merge branch \'readonly-p4-donut\' into donut | Brandon Ballinger | 2009-05-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge branch 'readonly-p4-donut' into donut | Brandon Ballinger | 2009-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | am b85c374: Merge change 1155 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge change 1155 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | | am e87bf13: am 1f8059f: AI 148461: Changes to support ADT 0.9.1. Update | Dirk Dougherty | 2009-05-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | am 1f8059f: AI 148461: Changes to support ADT 0.9.1. Update ADT version | Dirk Dougherty | 2009-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | | am 2a50606: am f096acd: AI 148460: Misc changes for dev site. | Dirk Dougherty | 2009-05-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | am f096acd: AI 148460: Misc changes for dev site. | Dirk Dougherty | 2009-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | / / / / / | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | am 08d00b9: Merge change 1159 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge change 1159 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ \ | am 39bfa72: Merge change 1158 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge change 1158 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | / / / / / / | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | am 0efb086: Merge change 1120 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge change 1120 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | am 5039606: Merge change 1152 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge change 1152 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | | am f792fc5: Merge change 1150 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge change 1150 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | | am a6706b3: Merge change 1131 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | Merge change 1131 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| / / / / / / / | | | |/ / / / / / / | ||||||
| * | | | | | | | | | am 90da134: Merge change 1065 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | Merge change 1065 into donut | Android (Google) Code Review | 2009-05-07 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | am 05d24af: Merge branch \'readonly-p4-donut\' into donut | Michael Chan | 2009-05-06 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | Merge branch 'readonly-p4-donut' into donut | Michael Chan | 2009-05-06 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | |