Jeff Sharkey 8059bcbfa7 resolved conflicts for merge of 1162fd77 to eclair-mr2

2009-11-16 14:49:07 -08:00

..

config

Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE

2009-05-01 17:47:08 -07:00

java

resolved conflicts for merge of 1162fd77 to eclair-mr2

2009-11-16 14:49:07 -08:00

jni

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

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

res

Let RemoteViews nest children, allow ViewFlipper.

2009-11-16 14:27:19 -08:00