summaryrefslogtreecommitdiff
path: root/libs/surfaceflinger/LayerBase.cpp
diff options
context:
space:
mode:
author Grace Kloba <klobag@google.com> 2010-01-21 17:57:29 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-21 17:57:29 -0800
commit0771ba9cf23f19c9662407fdd6a12845db225565 (patch)
tree1dc31e39fbe875c4e05888b219aad32f9958e1ff /libs/surfaceflinger/LayerBase.cpp
parent61ef50bb775712606728bb27be38157b467218d5 (diff)
parentb869c594465d29e96fb841b48c638ddee232bbd7 (diff)
am b869c594: (-s ours) am 17b14bd3: DO NOT MERGE
Merge commit 'b869c594465d29e96fb841b48c638ddee232bbd7' * commit 'b869c594465d29e96fb841b48c638ddee232bbd7': DO NOT MERGE
Diffstat (limited to 'libs/surfaceflinger/LayerBase.cpp')
0 files changed, 0 insertions, 0 deletions