summaryrefslogtreecommitdiff
path: root/libs/surfaceflinger/LayerBitmap.cpp
diff options
context:
space:
mode:
author Grace Kloba <klobag@google.com> 2009-08-03 12:15:29 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2009-08-03 12:15:29 -0700
commit5bfcf01ad44f5b624d73419b3925666b3cd1cc69 (patch)
tree0b68715dd4e88a5f382c37910081c7ec10efad3f /libs/surfaceflinger/LayerBitmap.cpp
parent245bdcfdd155c0345f03354b55c6f5cbb7677cd0 (diff)
parent48d7d2c60b340d6b175cc0ee39f5e1a82889e33f (diff)
am bf3e69ef: (-s ours) DO NOT MERGE Fix the build, which has been also fixed separately in the master
Merge commit 'bf3e69efacadd9186604a53fee0e6734b1723bcd' * commit 'bf3e69efacadd9186604a53fee0e6734b1723bcd': DO NOT MERGE
Diffstat (limited to 'libs/surfaceflinger/LayerBitmap.cpp')
0 files changed, 0 insertions, 0 deletions