diff options
| author | Patrick Scott <phanna@android.com> | 2009-12-09 15:59:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-09 15:59:44 -0800 |
| commit | d6ff12d85fa495360939545942ec32ece33f06b2 (patch) | |
| tree | c0aea11f6684a549244c6a3dc2ee37268aa51f3c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3ba1818f590dd083430e1948cc54aad2a5fb9a8c (diff) | |
| parent | a3260ecb4d82803506f755f73757b41294ce3c64 (diff) | |
am a50d4508: Merge change I75481cb8 into eclair-mr2
Merge commit 'a50d450863cb84805ac6809a4c1f7b83984da1ee' into eclair-mr2-plus-aosp
* commit 'a50d450863cb84805ac6809a4c1f7b83984da1ee':
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