diff options
| author | Patrick Scott <phanna@android.com> | 2009-12-10 12:17:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-10 12:17:12 -0800 |
| commit | d16c9b79b06fa41bd1183a53c8e652797c2af0f0 (patch) | |
| tree | 293cbba9a43f02f8f9027519e96389ab780fd6da /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0e5f195e7c49008c5e781f6cfe9ecba866edfb62 (diff) | |
| parent | d6ff12d85fa495360939545942ec32ece33f06b2 (diff) | |
am a14b4890: am a50d4508: Merge change I75481cb8 into eclair-mr2
Merge commit 'a14b4890b914971c01bf130697090e7e775aeab4'
* commit 'a14b4890b914971c01bf130697090e7e775aeab4':
Check that the resolved activity is not in our package.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions