summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author David Brown <dab@google.com> 2011-11-17 15:12:54 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-17 15:12:54 -0800
commit98019c135cc261ec7e4e089afdf042d311aba54b (patch)
tree27bbc5d508fc7a2ddaa93dcf8bdc84e0ba691b97 /opengl/libagl/TextureObjectManager.cpp
parent2998cb124212b1993a7d9fb5a93522b7955e329b (diff)
parentc1bb1bc3645563bb86f00969031d6e0a705dce8c (diff)
am 19a57bde: am 1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1
* commit '19a57bdedf3f9ccfa4d45cd35ef4b379853c6a81': SIP addresses containing "911" shouldn't be considered emergency calls
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions