diff options
| author | Eric Fischer <enf@google.com> | 2010-09-23 13:49:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 13:49:44 -0700 |
| commit | 2d9b3556bbc4f2f3bab12e406fb8d71652c67939 (patch) | |
| tree | d8edf6124d84ea83998f22a8e766e58fdfde6af4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6ee79cfa2f2885967910ffd27f6f81e1928b3d8d (diff) | |
| parent | a939afe2124b8e5be01be46f97b1bbf2fad5d65b (diff) | |
am 37cedce1: Merge "Add an aapt option to allow string variations for different devices." into gingerbread
Merge commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed' into gingerbread-plus-aosp
* commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed':
Add an aapt option to allow string variations for different devices.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions