repo sync c1786f1697 am d28fcd5b: resolved conflicts for merge of efd91d7c to eclair-mr2-plus-aosp
Merge commit 'd28fcd5bb8e5734a12b83f7cefde759c009e7b6e'

* commit 'd28fcd5bb8e5734a12b83f7cefde759c009e7b6e':
  Fixes for proximity sensor behavior:
2009-11-18 17:55:09 -08:00
..
2009-05-31 19:13:00 -07:00
2009-11-18 18:45:59 -05:00