diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-30 18:19:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 18:19:09 -0700 |
| commit | 9b4301378bb43f6dcab8e28d7a2965e76724eae3 (patch) | |
| tree | 75d47cdcbb7eadf0f96aa8203158ca157cc4a260 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1d38aff4f903ab82922723aa9dc831f3360f6566 (diff) | |
| parent | f25ba29a5b683bd2f7194c3276729bcd2cb7ff57 (diff) | |
am ab2e6284: Merge "Use the private version of userActivity." into gingerbread
Merge commit 'ab2e6284845794079d809e62c52c6c380b31c4b5' into gingerbread-plus-aosp
* commit 'ab2e6284845794079d809e62c52c6c380b31c4b5':
Use the private version of userActivity.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions