tree 59398ce402c1998b13a5a89db72a060b6884a54f
parent 25aa87b2fdd065637cc87cb4b3e58b828aa29120
parent 405d0898630a1c35e8e5ece072d8703fd68aca3b
author Android (Google) Code Review <android-gerrit@google.com> 1256756969 -0400
committer Android (Google) Code Review <android-gerrit@google.com> 1256756969 -0400

Merge change I8e7f5f07 into eclair

* changes:
  DO NOT MERGE: Fix loss of focus after wakeup into incall screen