diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-03-02 08:42:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-02 08:42:22 -0800 |
| commit | 6c9e5d41291ae3355ebee3aaa2f919a33a1c69e7 (patch) | |
| tree | e6f7deab63aaf7ba6d656dd85abfa23b7fd63cf8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 817d5fb864918c98c7019f8c503f8167ddf31adc (diff) | |
| parent | d4202c9d138459a60fde708ecda995f3b599d252 (diff) | |
am d4202c9d: am 921e8303: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit 'd4202c9d138459a60fde708ecda995f3b599d252':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions