Jim Miller 12814547b8 resolved conflicts for merge of 607b9c37 to eclair-mr2-plus-aosp

2009-11-16 14:08:24 -08:00

..

config

…

java

resolved conflicts for merge of 607b9c37 to eclair-mr2-plus-aosp

2009-11-16 14:08:24 -08:00

jni

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

2009-11-06 06:31:37 -08:00

res

am 16a9d9a7: Fix 2209086: Fix missing callback that was preventing tab bar text from updating.

2009-11-15 14:51:12 -08:00