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

..

config

…

java

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

2009-11-18 17:55:09 -08:00

jni

am cfa254fe: am 1ae7831b: am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting

2009-11-06 10:28:34 -08:00

res

am 86103cd7: resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp

2009-11-18 01:02:27 -08:00