OSDN Git Service

resolved conflicts for merge of 2624fbca to eclair-mr2
authorChristopher Tate <ctate@google.com>
Fri, 11 Dec 2009 21:16:41 +0000 (13:16 -0800)
committerChristopher Tate <ctate@google.com>
Fri, 11 Dec 2009 21:16:41 +0000 (13:16 -0800)
commitaf1255dab8fa3eab1caf9bae799f80de14a74470
tree9d7aa7af0e0da1beeb6a61fe41c56e05d30e4193
parent8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23
parent2624fbcaaa74b3a6d8d60d22d9e16ef26a98a6b2
resolved conflicts for merge of 2624fbca to eclair-mr2
services/java/com/android/server/WindowManagerService.java