summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-07-26 12:30:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-26 12:30:06 -0700
commit3c5cce654200834f947c390c97a2f0facb54dc2c (patch)
tree7845c43fd30484b450d101f924bc70d1b7f6c8f8 /opengl/tests/gl_basic/gl_basic.cpp
parent44188ffbf917949c5df81d37f2bff61564490239 (diff)
parent7cd60173144a88d330a14f38404b835b30a42654 (diff)
am 443d884e: am 3bee5af8: Battery stats: start removing last stats, keep total discharge.
Merge commit '443d884e16fad2e01a97aa788d4b30de53c94048' * commit '443d884e16fad2e01a97aa788d4b30de53c94048': Battery stats: start removing last stats, keep total discharge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions