Daisuke Miyakawa f4d7ffb0b1 am 5b2f5ced: am ddd017f8: Merge change I8daabf26 into eclair-mr2 ...

Merge commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8'

* commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8':
  Modify vCard exporter code so that it does not emit non-Ascii type.

2009-11-18 17:54:44 -08:00

..

config

…

java

am 5b2f5ced: am ddd017f8: Merge change I8daabf26 into eclair-mr2

2009-11-18 17:54:44 -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