summaryrefslogtreecommitdiff
path: root/libs/surfaceflinger/LayerBase.cpp
diff options
context:
space:
mode:
author Daniel Sandler <dsandler@android.com> 2010-04-20 13:06:57 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-04-20 13:06:57 -0700
commita42b781f04bef6e49eb1ba7df592290efc92ac48 (patch)
treebcd78f27aa16f4eb3ac56654238d126a8b1fa06e /libs/surfaceflinger/LayerBase.cpp
parent87445514bbb2d942ebe46a632c6c4ae956218ebc (diff)
parentcf19b1ace0845714b8828a670cc1b645019e1883 (diff)
am 29019cb9: (-s ours) am c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
Merge commit '29019cb9773dfc7645c9326725a6ac514020eef7' into kraken * commit '29019cb9773dfc7645c9326725a6ac514020eef7': Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)
Diffstat (limited to 'libs/surfaceflinger/LayerBase.cpp')
0 files changed, 0 insertions, 0 deletions