Jean-Baptiste Queru 3e2d59146d resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp ...

Change-Id: Ib7aa5a768f4606beb2a4387811cfed7c00cbc111

2012-05-01 10:02:02 -07:00

..

tests

…

AaptAssets.cpp

…

AaptAssets.h

…

Android.mk

…

Bundle.h

resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp

2012-05-01 09:54:38 -07:00

CacheUpdater.h

…

Command.cpp

Apply --extra-packages in case --custom-pacakge is also specified.

2012-04-26 13:13:08 -07:00

CrunchCache.cpp

…

CrunchCache.h

…

DirectoryWalker.h

…

FileFinder.cpp

…

FileFinder.h

…

Images.cpp

Embed layout padding in nine patch images

2012-04-04 12:05:59 -07:00

Images.h

aapt: Preprocess images in parallel.

2012-03-17 14:12:57 -07:00

Main.cpp

…

Main.h

…

NOTICE

…

Package.cpp

…

printapk.cpp

…

Resource.cpp

aapt: Preprocess images in parallel.

2012-03-17 14:12:57 -07:00

ResourceFilter.cpp

…

ResourceFilter.h

…

ResourceTable.cpp

resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp

2012-05-01 10:02:02 -07:00

ResourceTable.h

…

SourcePos.cpp

…

SourcePos.h

…

StringPool.cpp

Use qsort_r_compat() as a portable wrapper for qsort_r().

2012-03-19 14:08:58 -07:00

StringPool.h

Use qsort_r_compat() as a portable wrapper for qsort_r().

2012-03-19 14:08:58 -07:00

XMLNode.cpp

Remove dead code in StringPool.

2012-03-16 15:25:17 -07:00

XMLNode.h

…

ZipEntry.cpp

…

ZipEntry.h

…

ZipFile.cpp

frameworks/base: move Zip* from libandroidfw to libutils

2012-03-22 18:43:07 -07:00

ZipFile.h

…