summaryrefslogtreecommitdiffstats
path: root/opengl/java/android
diff options
context:
space:
mode:
authorCynthia Wong <cynthiaw@google.com>2009-11-09 13:26:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-09 13:26:00 -0800
commit6720bb8314600a2b55a18159b4a22dc4b18aec88 (patch)
treea1898d068dad60cb0b0f8988758e98215e110883 /opengl/java/android
parent29c00b0f09777c0ef94b53a0a7333d8416fb7abf (diff)
parent26c91fa694464c79de39988f9f42cee375ff0a14 (diff)
downloadframeworks_base-6720bb8314600a2b55a18159b4a22dc4b18aec88.zip
frameworks_base-6720bb8314600a2b55a18159b4a22dc4b18aec88.tar.gz
frameworks_base-6720bb8314600a2b55a18159b4a22dc4b18aec88.tar.bz2
am 26c91fa6: Merge change I4ff96000 into eclair-mr2
Merge commit '26c91fa694464c79de39988f9f42cee375ff0a14' into eclair-mr2-plus-aosp * commit '26c91fa694464c79de39988f9f42cee375ff0a14': new gservices flag for delaying bad gmail operations
Diffstat (limited to 'opengl/java/android')
0 files changed, 0 insertions, 0 deletions