OSDN Git Service

am cda27c79: (-s ours) am 72c0d293: am 763ccae7: (-s ours) Merge change I8e7f5f07...
authorChristopher Tate <ctate@android.com>
Thu, 29 Oct 2009 21:45:39 +0000 (14:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Oct 2009 21:45:39 +0000 (14:45 -0700)
Merge commit 'cda27c790adc37804ba1940c027621ab232de1b3'

* commit 'cda27c790adc37804ba1940c027621ab232de1b3':
  DO NOT MERGE: Fix loss of focus after wakeup into incall screen


Trivial merge