diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-30 19:48:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 19:48:31 -0700 |
| commit | 931bf48c971a6bb7fe37baf553e18247fc72ff36 (patch) | |
| tree | 69f33d22b47959c9522cfef749a5057131aa68f9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | eca94940924dea2b5bee5e5d6fe70f3542314438 (diff) | |
| parent | 9b4301378bb43f6dcab8e28d7a2965e76724eae3 (diff) | |
am 0457db37: am ab2e6284: Merge "Use the private version of userActivity." into gingerbread
Merge commit '0457db37de22d430df0e55a7552dcfe81b701627'
* commit '0457db37de22d430df0e55a7552dcfe81b701627':
Use the private version of userActivity.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions