summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2010-04-02 17:24:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-02 17:24:49 -0700
commit425edcc51741bce13f2f10226b3d2795cda70b17 (patch)
treecdbf9768a271b0e0c930e042bbf7359082ffb896 /opengl/tests/gl_basic/gl_basic.cpp
parent5febcc24e9376a18715bb2efae2125af5ddd6b4e (diff)
parent1a77a9171125ffcae97be8d57a20c42cdcbac41e (diff)
am 0913ce95: Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo
Merge commit '0913ce95c29371cb7b58e294a8d60262bc7f4329' into froyo-plus-aosp * commit '0913ce95c29371cb7b58e294a8d60262bc7f4329': Potential fix for bug: 2564824 : Device runtime restart in BatteryService
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions