summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-05-12 11:08:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-12 11:08:46 -0700
commitcd406480fa569ced379232d85efc4742c1bcc8c0 (patch)
tree1da85f32dbecd5d62e79d5a68d57f0398547714b /opengl
parentaf0ff93c4c4c526bddfe9030964cc189ca12118f (diff)
parent5d8d9f1ff10960d2f826bf6c0b91e16a33a15ff8 (diff)
downloadframeworks_native-cd406480fa569ced379232d85efc4742c1bcc8c0.zip
frameworks_native-cd406480fa569ced379232d85efc4742c1bcc8c0.tar.gz
frameworks_native-cd406480fa569ced379232d85efc4742c1bcc8c0.tar.bz2
am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
Merge commit 'a04202b3258845688bcd8c6208222235569df733' into froyo-plus-aosp * commit 'a04202b3258845688bcd8c6208222235569df733': Doc change: remove Google I/O 09 from carousel.
Diffstat (limited to 'opengl')
0 files changed, 0 insertions, 0 deletions