summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Matthew Xie <mattx@google.com> 2011-11-09 14:35:53 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-09 14:35:53 +0000
commitcd99c18818e2ecf6cfd46c48f4e00675af2b6448 (patch)
tree003994e335f13de9e020a626dc41355b6a430256 /opengl/libagl/TextureObjectManager.cpp
parentf96004644b98fbb68c7de2ae48889c7f725c7260 (diff)
parent371ca8ca494b9d51ca8fa5f943791eb2d4542ffa (diff)
am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
* commit '48542eb39e55f2d0e2a79d43e696ffb2acb67b5c': Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions