diff options
| author | Scott Main <smain@google.com> | 2011-06-03 15:29:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-03 15:29:17 -0700 |
| commit | 5550bce7e9028d581edf7894e08ff1a665dd1fcd (patch) | |
| tree | f131f449d1316816f9fb2411882e310e1c6f955d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b17ba60b84b73e7f5e31ae4005c05db97d61f5a8 (diff) | |
| parent | 752bc2f73890c1a5020c69e6e120ef45144ed414 (diff) | |
am b9040e77: am 5b8342cf: am a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2
* commit 'b9040e774920c4641c154df2a358100cf78a2bd3':
cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions