diff options
| author | Joe Onorato <joeo@google.com> | 2010-10-07 12:22:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 12:22:03 -0700 |
| commit | 4c7d73e564c03459c1c3402f0735348305c2dfc4 (patch) | |
| tree | 8d8c8b31eb975d7399055448629ec0c0517c7190 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a417c7d64ce3f29cc460ec24d21edcdff7f1796a (diff) | |
| parent | 494e9e83c22213cc9e0e5a020a7b2ecd869a2dab (diff) | |
am 2c164747: am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread
Merge commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba'
* commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba':
PowerManagerService needs yet another flag...
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions