diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-29 14:47:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-29 14:47:50 -0700 |
| commit | 2b1a8b13904dcac4abd5cfceb56748cfb8c1f972 (patch) | |
| tree | ed72b05d656ab191b84a0d24b46320e2402318e4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e437ff809942d3a234165d22cbf100f0f5b847ab (diff) | |
| parent | 1b35deb3a6e8174a2ac148bf348a42203e2e6e94 (diff) | |
am 67897b1a: (-s ours) Merge change 8884 into donut
Merge commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d'
* commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d':
DO NOT MERGE. Already in master. Fix calendar test.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions