summaryrefslogtreecommitdiff
path: root/libs/surfaceflinger/Layer.cpp
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2010-05-12 11:10:10 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-12 11:10:10 -0700
commite46defea3ae15787aa6afbb91cb9dc83d4a074e4 (patch)
tree15ab86dcd8f11585a7c122c4c13d969b80dc6a4c /libs/surfaceflinger/Layer.cpp
parentafbc5fad91a5da627b908526b9604833d8d37bcb (diff)
parent68b37d14708414d3cee418024c178f0a3c7d8b5b (diff)
am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
Merge commit '68b37d14708414d3cee418024c178f0a3c7d8b5b' into kraken * commit '68b37d14708414d3cee418024c178f0a3c7d8b5b': Doc change: remove Google I/O 09 from carousel.
Diffstat (limited to 'libs/surfaceflinger/Layer.cpp')
0 files changed, 0 insertions, 0 deletions