diff options
| author | Fred Chung <fchung@google.com> | 2010-10-05 23:39:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 23:39:23 -0700 |
| commit | 9211b05c4055e1b9ea1a97a7b09f776595b9b05b (patch) | |
| tree | 7f7278dcb9a27bd292132b990aa16eb944bfe001 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 544360db825ad2a67d457239422b3ee1a8b37964 (diff) | |
| parent | 0a95ad1e3b57e6abdce27f7908c384f4ea9c99f7 (diff) | |
am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo
Merge commit '30264c9b85109ae58c1e472a747bf47464cc1632' into gingerbread
* commit '30264c9b85109ae58c1e472a747bf47464cc1632':
Doc change: Adding new docs for Device Admin API.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions