summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRuchi Kandoi <kandoiruchi@google.com>2015-08-26 00:22:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-26 00:22:12 +0000
commit2057e777b31b6904fd29eac562ee15526000902f (patch)
tree405c9b306074993231787569b480ecb79568eb52 /opengl/tests/gl_basic/gl_basic.cpp
parent05d902b7a377920354327125e680fa97eb8a13f8 (diff)
parentcf1fedef98db7a5ae30685cdc47b5b6e107fba50 (diff)
am cf1fedef: am 2acadb3f: Merge "BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties."
* commit 'cf1fedef98db7a5ae30685cdc47b5b6e107fba50': BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions