diff options
| author | Dan Morrill <morrildl@google.com> | 2011-06-13 11:59:38 -0700 |
|---|---|---|
| committer | Dan Morrill <morrildl@google.com> | 2011-06-13 11:59:38 -0700 |
| commit | 308a3f179ed0957a9dbb52947ca7337501eb93f6 (patch) | |
| tree | 0c82e60cb9d297caa5d2f66016ca7ded75d71b0d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ff66c00bc669280eb02cdfccf2b8889a900ac15d (diff) | |
| parent | 5e76bf903749ea32e9648915968d6795f9dc4014 (diff) | |
Fix merge conflict for 'c2e1e329'.
Conflicts:
core/res/res/values/config.xml
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
Change-Id: I5898fe2cbfb3a4bdcb28c27adb51d2aa93138f99
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions