diff options
| author | Jim Miller <jaggies@google.com> | 2010-05-11 10:18:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-11 10:18:38 -0700 |
| commit | 0528895b0dcdbd9d45cd6f51ae2a1017d15ca6d1 (patch) | |
| tree | 476ae738583482b7fe7952f52a73c228a2824d1f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 22cffae52d7f2c04b54d47503f8bfea5dca92535 (diff) | |
| parent | dbcc5242bc55dc551f2a7fa4e28d2449ab8d5374 (diff) | |
am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
Merge commit 'a27579016caf1438400a3637e3896bec653e3756' into froyo-plus-aosp
* commit 'a27579016caf1438400a3637e3896bec653e3756':
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