Android Git Automerger 9cefd00f83 resolved conflicts for merge of 6ba69734 to eclair, skipping preloaded-classes as pre Bob

2009-08-18 13:08:40 -07:00

..

aapt

am 75c49842: Add maxSdkVersion information in dump badging option

2009-08-18 10:59:08 -07:00

aidl

am 747cb3b5: Merge change 9670 into donut

2009-08-04 11:23:04 -07:00

layoutlib

am ace6a5cf: Merge change 21408 into donut

2009-08-18 11:01:19 -07:00

localize

am ad39eb0a: Merge change 5302 into donut

2009-06-24 19:15:57 -07:00

makekeycodes

auto import from //depot/cupcake/@135843

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

preload

Simplified algorithm used to generate the preloaded-classes list. Generated a new preloaded-classes file.

2009-08-17 15:36:15 -07:00