diff options
| author | Adam Powell <adamp@google.com> | 2010-10-01 15:55:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 15:55:44 -0700 |
| commit | 5f07bee4543a70fe305e79d048ad9e5ec4235d23 (patch) | |
| tree | 75d47cdcbb7eadf0f96aa8203158ca157cc4a260 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d9018f09331eb3665ca9b6faf847482ef836f64d (diff) | |
| parent | 0cb6b18839bdec5a5ea1f1e33cf3ad7625cb5f97 (diff) | |
am 98f31087: Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread
Merge commit '98f310879790a98c4c24cd06677e08bf49f1cea0' into gingerbread-plus-aosp
* commit '98f310879790a98c4c24cd06677e08bf49f1cea0':
DO NOT MERGE Fix bug 3026771, other design/asset fixes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions