summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.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
commit5bb33718236cee8dea9457ffa5ba99ba930ac9ab (patch)
treec0fb6ce2540bcb77e8425c954c3524f5d1399af3 /libs/ui/FramebufferNativeWindow.cpp
parentf95a61746e72ba6fce6afb5b94f2ff051af681b9 (diff)
parent89fec7b155981d6e99eb1e05793f343a5d04aa59 (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 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions