Jeff Sharkey 35d857002d am 8059bcbf: resolved conflicts for merge of 1162fd77 to eclair-mr2 ...

Merge commit '8059bcbfa71c8233e616304843d9280f5f1615bb' into eclair-mr2-plus-aosp

* commit '8059bcbfa71c8233e616304843d9280f5f1615bb':
  Let RemoteViews nest children, allow ViewFlipper.

2009-11-16 14:55:37 -08:00

..

config

…

java

am 8059bcbf: resolved conflicts for merge of 1162fd77 to eclair-mr2

2009-11-16 14:55:37 -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