diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-04-16 15:21:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-16 15:21:38 -0700 |
| commit | e599c7e02a62cc167b426877200c0c37d43b37fd (patch) | |
| tree | c5a922a844ec13a0a5c16c639ae0c309be17e8cd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1ee4985495e65392547547a499fe90698644572b (diff) | |
| parent | 4a7c89014ba9b64552532f8c70687a5908e988fc (diff) | |
am a9ea147d: merge from open-source master
Merge commit 'a9ea147dc204cd3eed7ed99f8b7d6464c7f740bf' into kraken
* commit 'a9ea147dc204cd3eed7ed99f8b7d6464c7f740bf':
Unify am startservice commands.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions