Commit 8e9cfb10 authored Nov 18, 2009 by repo sync Committed by Android Git Automerger Nov 18, 2009

am d28fcd5b: resolved conflicts for merge of efd91d7c to eclair-mr2-plus-aosp

Merge commit 'd28fcd5bb8e5734a12b83f7cefde759c009e7b6e'

* commit 'd28fcd5bb8e5734a12b83f7cefde759c009e7b6e':
  Fixes for proximity sensor behavior:

There are no changes