summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Matthew Xie <mattx@google.com> 2011-12-01 13:34:18 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-12-01 13:34:18 -0800
commit89610203c32dcd1a383d4f4c8aa9041501fbdf60 (patch)
tree60a86919e626e09690310f1a42282c82c53f52ac /opengl/libagl/TextureObjectManager.cpp
parentde8f840dec99067cc6e7fff61be53ccd8a16a1b0 (diff)
parent3c418d0c7b7f67eda9f7bb1076b5f23ce63ad34e (diff)
am 1a1be44c: Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1
* commit '1a1be44c5bf1e6099d678c81ef5e9326cabcb3df': Unlink the Binder DeathRecipient when removing a Bluetooth service record
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions