summaryrefslogtreecommitdiff
path: root/opengl/java/android
diff options
context:
space:
mode:
author John Wang <johnwang@google.com> 2010-01-27 17:26:40 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-27 17:26:40 -0800
commita338136499cd3279025db8c389ac32cd44c31c29 (patch)
treef8ec0e111858f47cf92275906de0397fb53ef1af /opengl/java/android
parente7bd22a9d9441916aa9c67d80ee9f02a2d3e10e5 (diff)
parent97fdd0aba93f7c609c1194edf636805ff70e4918 (diff)
am 97fdd0ab: am 7f70998d: Merge "Add Emergency Calls Only String." into eclair
Merge commit '97fdd0aba93f7c609c1194edf636805ff70e4918' * commit '97fdd0aba93f7c609c1194edf636805ff70e4918': Add Emergency Calls Only String.
Diffstat (limited to 'opengl/java/android')
0 files changed, 0 insertions, 0 deletions