diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-08-27 12:23:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-27 12:23:39 -0700 |
| commit | 50de57ad77888f4740fb8a46ecbbf4fa679d2a0e (patch) | |
| tree | a1e52df4cb2b69ac028bb1da45c65a37a96365fb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 46adfbc949c43e59b97ad45746ab42633a734aed (diff) | |
| parent | 73414a12ad204b068ed50ded3b38c7285c19a279 (diff) | |
am b94493fe: Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread
Merge commit 'b94493feaf8b7a620a25c23c1f131a999ed61293' into gingerbread-plus-aosp
* commit 'b94493feaf8b7a620a25c23c1f131a999ed61293':
Document blocking behavior of ImageView setImageURI and setImageResource
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions