diff options
| author | Kenny Root <kroot@google.com> | 2010-07-28 14:51:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 14:51:29 -0700 |
| commit | c4b09f97486858e938c5747fc327ecb65a84e6a1 (patch) | |
| tree | dcc4d4d6a93ef10e3f11946f8877e0b646eaf327 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5cde867d20f66c10a16b1908ce9c677beec7eeaa (diff) | |
| parent | 5f482e915f37eadf2a87fbd1bdd93e9f721bf540 (diff) | |
am 56c02dc3: Merge "Fix getTempContainerId()" into gingerbread
Merge commit '56c02dc3d325bab8549ec34b9d6aa7c62ef742d0' into gingerbread-plus-aosp
* commit '56c02dc3d325bab8549ec34b9d6aa7c62ef742d0':
Fix getTempContainerId()
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions