diff options
| author | Scott Main <smain@google.com> | 2011-12-15 19:52:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-15 19:52:50 -0800 |
| commit | 75e12152fd6cd9d233c2c8b158763c051b79cb98 (patch) | |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 275749e79631976af28033eabe44b70eba60c29e (diff) | |
| parent | 9827c71df4b8cc72da4c58b1d400861f22d63841 (diff) | |
am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '5dac1976198e5fa553749cd145c7484f3ff45c6b':
Doc merge from master:Training class on Identifying and Authenticating Users.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions