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

Merge commit '35d857002dcbc24d05a0f9d157ce8ee1927ae235'

* commit '35d857002dcbc24d05a0f9d157ce8ee1927ae235':
  Let RemoteViews nest children, allow ViewFlipper.

2009-11-17 07:32:55 -08:00

..

android

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

2009-11-17 07:32:55 -08:00

com

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

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

jarjar-rules.txt

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

overview.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00