summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Nick Pelly <npelly@google.com> 2011-03-25 15:51:42 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-25 15:51:42 -0700
commit5c0652d4f3778a8a9e1258bd98caa1811d32e97f (patch)
tree2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/libagl/TextureObjectManager.cpp
parent254b763c977dbe0465902913fc2f689365a8829b (diff)
parent7821c1bd81eec41cc8e359de9f544749da4493e8 (diff)
am 14923862: am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
* commit '14923862577ef785d20fc5c627248897c9eaddb6': NfcAdapterExtras: reset singleton state if initialization fails.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions