summaryrefslogtreecommitdiff
path: root/opengl/libagl/texture.cpp
diff options
context:
space:
mode:
author John Wang <johnwang@google.com> 2010-01-28 10:47:27 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-28 10:47:27 -0800
commit0515c9dc5bcc40f64c2e5d63dad682b1d5e349b6 (patch)
treeb9b8be6cf5b834c61cf78f81e0ced17370f06a8a /opengl/libagl/texture.cpp
parentdea3af75f5cda068ad80e6168c53088cb0791865 (diff)
parente390ac7b9f89017145f05c1aaa94ace6aba3e657 (diff)
am 89fec7b1: am 098295a5: Merge "Updated emergency string when locale changes." into eclair
Merge commit '89fec7b155981d6e99eb1e05793f343a5d04aa59' * commit '89fec7b155981d6e99eb1e05793f343a5d04aa59': Updated emergency string when locale changes.
Diffstat (limited to 'opengl/libagl/texture.cpp')
0 files changed, 0 insertions, 0 deletions