diff options
| author | Cary Clark <cary@android.com> | 2010-08-26 15:52:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-26 15:52:24 -0700 |
| commit | 392f707d3fa70b472b7ab27993f6161eacd1497e (patch) | |
| tree | 6ca310606cc8eca244bad34907fd7759836cb772 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0e5eb83567de0448274ab9c48a59a6bfbc3c9d3d (diff) | |
| parent | 338d568a6305c286144f97bfb2f6d3d11572c80b (diff) | |
am 3a6bfd4c: (-s ours) am ed101933: Merge "DO NOT MERGE -- copy on tapping outside of selected text in gmail" into gingerbread
Merge commit '3a6bfd4cbf35343f5a784d9f970962becdeb0633'
* commit '3a6bfd4cbf35343f5a784d9f970962becdeb0633':
DO NOT MERGE -- copy on tapping outside of selected text in gmail
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions