summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Nick Pelly <npelly@google.com> 2011-11-17 15:12:56 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-17 15:12:56 -0800
commit1fa578c5df86dc3b0b416c98640f8a06f9bc4f62 (patch)
tree27bbc5d508fc7a2ddaa93dcf8bdc84e0ba691b97 /opengl/libagl/TextureObjectManager.cpp
parent98019c135cc261ec7e4e089afdf042d311aba54b (diff)
parent637742c34e9db537260bfbd02b461218d2a8f214 (diff)
am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
* commit 'c6a0277bca29359ec1aee123495065982d2eea7a': Fix NPE on devices that don't have NFC.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions