summaryrefslogtreecommitdiffstats
path: root/libs/surfaceflinger/Layer.cpp
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-05-10 09:49:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-10 09:49:13 -0700
commit47de84c359ad46a7b4dd47eaac6af6ceb21b4772 (patch)
treee8a84bdae153d4e27ba7ef922573873c818ba8a1 /libs/surfaceflinger/Layer.cpp
parentdc3e26071399789c5966b9cd67180437f44eb9dd (diff)
parentaff856d053ba239114e7f16d3cdd240a6d973f2f (diff)
downloadframeworks_base-47de84c359ad46a7b4dd47eaac6af6ceb21b4772.zip
frameworks_base-47de84c359ad46a7b4dd47eaac6af6ceb21b4772.tar.gz
frameworks_base-47de84c359ad46a7b4dd47eaac6af6ceb21b4772.tar.bz2
am aff856d0: am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Merge commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f' into kraken * commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f': Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
Diffstat (limited to 'libs/surfaceflinger/Layer.cpp')
0 files changed, 0 insertions, 0 deletions