diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-04-02 13:42:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 13:42:09 -0700 |
| commit | dc8c03a8b4ea25e2e21fd9c32d64650e8571c179 (patch) | |
| tree | ba02998adcfbe8e2fb1483d418f63704657336f5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9a8c69fbfa42f19400893081e51d6ce878b13a4c (diff) | |
| parent | b64822a3caa1f5edf0556cd20d60aad453f932e5 (diff) | |
am 9bdc4508: am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo
Merge commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d' into kraken
* commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d':
Add a new intent category used for activities running in carmode.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions