diff options
| author | Scott Main <smain@google.com> | 2011-12-15 19:55:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-15 19:55:00 -0800 |
| commit | 63752fc830be6f83d061806c33b42d8abb4cdf19 (patch) | |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e872d9213ff033da5913c11a5a5ea1100ee3d107 (diff) | |
| parent | 75e12152fd6cd9d233c2c8b158763c051b79cb98 (diff) | |
am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '26e461b34f5f9eef79aa30f1304cca4262ff88ed':
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