Adam Lesinski 94c40a4cf9 resolved conflicts for merge of 1b5b60d6 to master ...

Change-Id: I2b713a55fcdf02c01afa99f175bf14248f210460

2014-02-04 11:00:03 -08:00

..

tests

…

AaptAssets.cpp

resolved conflicts for merge of 1b5b60d6 to master

2014-02-04 11:00:03 -08:00

AaptAssets.h

…

Android.mk

Reimplement ZipFileRO in terms of libziparchive.

2014-01-27 10:31:09 -08:00

Bundle.h

resolved conflicts for merge of 1b5b60d6 to master

2014-02-04 11:00:03 -08:00

CacheUpdater.h

…

Command.cpp

resolved conflicts for merge of 1b5b60d6 to master

2014-02-04 11:00:03 -08:00

CrunchCache.cpp

…

CrunchCache.h

…

DirectoryWalker.h

…

FileFinder.cpp

…

FileFinder.h

…

Images.cpp

Re-apply several tools fixes lost by the directory rearrangement.

2014-01-27 10:31:08 -08:00

Images.h

…

Main.cpp

resolved conflicts for merge of 1b5b60d6 to master

2014-02-04 11:00:03 -08:00

Main.h

…

NOTICE

…

Package.cpp

…

printapk.cpp

…

pseudolocalize.cpp

…

pseudolocalize.h

…

qsort_r_compat.c

…

qsort_r_compat.h

…

Resource.cpp

Change ResourceType cookies to int32_t.

2014-01-31 13:47:27 +00:00

ResourceFilter.cpp

…

ResourceFilter.h

…

ResourceIdCache.cpp

…

ResourceIdCache.h

…

ResourceTable.cpp

Don't pseudolocalize untranslatable strings.

2014-01-27 10:31:10 -08:00

ResourceTable.h

…

SourcePos.cpp

…

SourcePos.h

…

StringPool.cpp

…

StringPool.h

…

WorkQueue.cpp

…

WorkQueue.h

…

XMLNode.cpp

…

XMLNode.h

…

ZipEntry.cpp

…

ZipEntry.h

…

ZipFile.cpp

…

ZipFile.h

…