OSDN Git Service

am f764dae4: am 33ad0f9e: Merge change I0e44976a into eclair
authorMathias Agopian <mathias@google.com>
Wed, 2 Dec 2009 17:56:08 +0000 (09:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 17:56:08 +0000 (09:56 -0800)
commit44dcf411b01bdbd0ae2aeef3e958403a1096f36b
treee02fa088732f722c551bfb119dae2d44b8a319c4
parent1e8c96251ca885db700978a3566a67af27099b02
parentf764dae4a5f662660bea0657746622b6672b24a9
am f764dae4: am 33ad0f9e: Merge change I0e44976a into eclair

Merge commit 'f764dae4a5f662660bea0657746622b6672b24a9' into eclair-mr2-plus-aosp

* commit 'f764dae4a5f662660bea0657746622b6672b24a9':
  fix [2297155] SurfaceFlinger's freeze-timeout doesn't work