diff options
| author | Scott Main <smain@google.com> | 2011-06-02 10:01:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-02 10:01:53 -0700 |
| commit | dc26da8320d699d372d74ef0f71d815560bf2e8c (patch) | |
| tree | 33d8bee1a76c70280f53cabf06b2f935cb64140d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 46b600df71ad3a27139b3593557af9b8c1aafbbf (diff) | |
| parent | 7d0972efde0db9152b4a7078e986ae6019498130 (diff) | |
am a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2
* commit 'a86290891a661ecdc8115fd441b44dcebedb9e3d':
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