summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-09-20 17:19:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-20 17:19:04 -0700
commit4313b5a7806d687b1bf2deec513c05d45fac1595 (patch)
tree7d0f7ca035d28794849b31df6f339e41ce6bee2c /opengl/tests/gl_basic/gl_basic.cpp
parent44bfeb931d53db527c4e7f2ec1d3b7bf0a22aa37 (diff)
parentabbf805c91bb988ce2cf8044c75af25a1185699e (diff)
am 307aef01: Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread
Merge commit '307aef01257cbba42f095f7020a4a3b753f3807b' into gingerbread-plus-aosp * commit '307aef01257cbba42f095f7020a4a3b753f3807b': LocationManager: Hide location provider and geocode provider APIs.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions