diff options
| author | Adam Powell <adamp@google.com> | 2012-01-18 14:49:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-18 14:49:30 -0800 |
| commit | 589629d2de40bbe2ec2b891febb05d8fa16b0cc9 (patch) | |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3d515c3a2eff6e6b7addd1874bcf5dad1daeaf04 (diff) | |
| parent | 9d40d1e8d006c444f35e4699da676b93683e79dc (diff) | |
am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit '04f3848986efda8cf006f575d2e4990f120a1bc8':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions