diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-04-16 12:50:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-16 12:50:54 -0700 |
| commit | 2a5384756ace3fb761cb00a1aef7f44c9019457c (patch) | |
| tree | c5a922a844ec13a0a5c16c639ae0c309be17e8cd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | add9e7fe7640c8ee31947e38d614f74037d8bf27 (diff) | |
| parent | 3d95a00b2c98d886d62182e2831f744f8ac0ffa9 (diff) | |
am 329a5214: merge from open-source master
Merge commit '329a52141c52e15caf4f0dba1735857c4ef4d478' into kraken
* commit '329a52141c52e15caf4f0dba1735857c4ef4d478':
Allow Am to start services
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions