OSDN Git Service

am 46f7f860: Merge "Fix a dead lock while we freeze the screen." into jb-dev
authorOwen Lin <owenlin@google.com>
Wed, 16 May 2012 20:45:15 +0000 (13:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 May 2012 20:45:15 +0000 (13:45 -0700)
* commit '46f7f860ebae5a8f98e3a174a1c3d180d0cbc0ac':
  Fix a dead lock while we freeze the screen.


Trivial merge