Dianne Hackborn 58520b24d4 resolved conflicts for merge of 10d5b096 to master ...

Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7

2010-10-04 14:54:59 -07:00

..

aapt

resolved conflicts for merge of 10d5b096 to master

2010-10-04 14:54:59 -07:00

aidl

am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo

2010-06-15 15:21:14 -07:00

layoutlib

Merge "layoutlib_create: Generate delegate to implement native methods."

2010-10-04 12:46:37 -07:00

localize

Fix linux 64 build

2010-08-24 20:20:50 -07:00

makekeycodes

…

obbtool

Add "none" for vold and deprecate mkobb -c

2010-10-01 14:02:47 -07:00

preload

…