diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-03-30 16:05:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-30 16:05:05 -0700 |
| commit | 6c545b685ea26673248b7886f69c878c4b0c2d06 (patch) | |
| tree | 8652850ea1b71670da1d7dd4420a16676827c007 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c0ffdb7762b9bb4f5bfa55d5ef689a2d87d38e31 (diff) | |
| parent | e31835943bd9c4bdb8452a934de41ef9d2b03782 (diff) | |
am 6d630607: am 5cdd7858: Merge "Fix issue #2553553: API REVIEW: android.context.Context" into froyo
Merge commit '6d63060768f9d73c6062a2b603d3c51c7d5f0043' into kraken
* commit '6d63060768f9d73c6062a2b603d3c51c7d5f0043':
Fix issue #2553553: API REVIEW: android.context.Context
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions