diff options
| author | Romain Guy <romainguy@google.com> | 2010-04-10 11:48:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-10 11:48:02 -0700 |
| commit | dac67195b9d9bb1265f3e5736d2b5ff29923e4fd (patch) | |
| tree | c4333b1d19b4dea3beb4fd5c98a3afcd88572544 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ec3bc500c63d11a0d0e17b398f615e0937e805af (diff) | |
| parent | 0bcb08c19f5551dc4fe1d6289ddc530ace31bb9e (diff) | |
am 376722fc: am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo
Merge commit '376722fcdf41ade7286bcdb757564559d35a4976' into kraken
* commit '376722fcdf41ade7286bcdb757564559d35a4976':
Fix regression introduced when fixing focus issue with ScrollView.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions