summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2011-11-16 18:03:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-16 18:03:51 -0800
commit5511635090072ce02a4fb07ec25a7c279a7bbc8a (patch)
tree5ea7a9e7fc29b8792bfdb85b7ad65c6d96cb4a91 /opengl/tests/gl_basic/gl_basic.cpp
parent9e502e90b58b4d0bbb792ef1c40dcfd9b9322ce8 (diff)
parent4fdfdeedc64eef2efe3811198e8fad40aa1b8fc3 (diff)
am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1
* commit '4fdfdeedc64eef2efe3811198e8fad40aa1b8fc3': Revert change to setInitialScale() to take display density into account.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions