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

…

layoutlib

Update imports to android-common

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

localize

…

makekeycodes

…

preload

…