diff options
| author | Jim Miller <jaggies@google.com> | 2010-05-11 10:23:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-11 10:23:42 -0700 |
| commit | 522fb399abb6653912ae51066adba59922a9df95 (patch) | |
| tree | b013fbb9d1d2f493488ba7f3fcebca98f88110c1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8ccfd2eeeb992278267d18bedbb55530d4100c04 (diff) | |
| parent | 0528895b0dcdbd9d45cd6f51ae2a1017d15ca6d1 (diff) | |
am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
Merge commit '4d89954dc4572a05339dc7a95ec683892558162b' into kraken
* commit '4d89954dc4572a05339dc7a95ec683892558162b':
Fix 2660488: Add LockScreen/InCallScreen resources to preloads
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions