tree bb2b69084a7b7209c7c717f4f52874f5197c1672
parent 7f5948d1e3e0b79ea6808e3b5f5fb0c1a8157e33
parent 11bed4a776856abca75e68f2327a3e277a064273
author Mathias Agopian <mathias@google.com> 1284686773 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284686773 -0700

am 8f476407: am 08710dcd: Merge "part of fix for [3004226] Cannot end the call - Proximity sensor doesn\'t work" into gingerbread

Merge commit '8f476407bf4e6283b128532d594d44cc527e8204'

* commit '8f476407bf4e6283b128532d594d44cc527e8204':
  part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work