The Android Open Source Project bb59a9f428 Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23' ...

Conflicts:
	api/current.xml
	core/res/res/values/public.xml

2009-05-20 22:41:10 -07:00

..

tests/plurals

…

AaptAssets.cpp

…

AaptAssets.h

…

Android.mk

…

Bundle.h

Argh fix another build breakage!

2009-05-15 18:50:34 -07:00

Command.cpp

Update aapt badging for native code, configs, density, etc.

2009-05-18 15:22:00 -07:00

Images.cpp

…

Images.h

…

Main.cpp

Implement compatibility support for WRITE_SDCARD permission.

2009-05-15 18:23:56 -07:00

Main.h

…

Package.cpp

…

printapk.cpp

…

Resource.cpp

Implement compatibility support for WRITE_SDCARD permission.

2009-05-15 18:23:56 -07:00

ResourceTable.cpp

Add padding to public.xml to avoid breaking from auto-merges.

2009-05-20 16:30:59 -07:00

ResourceTable.h

Implement compatibility support for WRITE_SDCARD permission.

2009-05-15 18:23:56 -07:00

SourcePos.cpp

…

SourcePos.h

…

StringPool.cpp

…

StringPool.h

…

XMLNode.cpp

Implement compatibility support for WRITE_SDCARD permission.

2009-05-15 18:23:56 -07:00

XMLNode.h

Implement compatibility support for WRITE_SDCARD permission.

2009-05-15 18:23:56 -07:00