OSDN Git Service

am 3b3968b5: am 46f7f860: Merge "Fix a dead lock while we freeze the screen." into...
authorOwen Lin <owenlin@google.com>
Thu, 17 May 2012 22:32:46 +0000 (15:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 May 2012 22:32:46 +0000 (15:32 -0700)
* commit '3b3968b54d766e73da8d43e37d5db8942298b661':
  Fix a dead lock while we freeze the screen.


Trivial merge