summaryrefslogtreecommitdiff
path: root/opengl/libagl/light.cpp
diff options
context:
space:
mode:
author Jim Miller <jaggies@google.com> 2010-01-22 20:23:37 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-22 20:23:37 -0800
commit65c1cbfaa1533ed5a81fa6b106e67a819345bfab (patch)
treef4d901d22f470e7d421cde73033da6a191f7db17 /opengl/libagl/light.cpp
parentc11cc12776f142cb5e3902530970f1e1833e2fa4 (diff)
parent4691ef5e0f0c48a4246b10d0f37c5ad21955ace9 (diff)
am 2e4e25f3: Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair
Merge commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc' into eclair-plus-aosp * commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc': Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
Diffstat (limited to 'opengl/libagl/light.cpp')
0 files changed, 0 insertions, 0 deletions