Tom Taylor f0108cda21 resolved conflicts for merge of ad2fa35d to master ...

Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90

2009-12-22 10:11:55 -08:00

..

aapt

am 15f1bfb0: Merge change I70d0bddb into eclair-mr2

2009-12-14 16:28:03 -08:00

aidl

merge from donut

2009-09-03 15:19:21 -07:00

layoutlib

Update imports to android-common

2009-12-21 13:59:18 -08:00

localize

Merge korg/donut into korg/master

2009-07-25 21:15:25 -07:00

makekeycodes

auto import from //depot/cupcake/@135843

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

preload

Added tool to generate application-specific reports from class load profiling data. Generated new profiling data. Deleted old data. Generated new preloaded-classes file.

2009-09-23 11:21:22 -07:00