Xavier Ducrohet b7de2194d5 resolved conflicts for merge of c71c678e to master ...

Change-Id: I9e1a6a1151af00f0a13e2010776276b240e0ac3a

2013-01-15 16:41:29 -08:00

..

tests

…

AaptAssets.cpp

…

AaptAssets.h

…

Android.mk

Cache resource ID lookups in aapt

2012-11-28 15:32:46 -08:00

Bundle.h

Add single crunch command to aapt. do not merge.

2013-01-02 15:41:52 -08:00

CacheUpdater.h

…

Command.cpp

resolved conflicts for merge of c71c678e to master

2013-01-15 16:41:29 -08:00

CrunchCache.cpp

…

CrunchCache.h

…

DirectoryWalker.h

…

FileFinder.cpp

…

FileFinder.h

…

Images.cpp

…

Images.h

…

Main.cpp

Add single crunch command to aapt. do not merge.

2013-01-02 15:41:52 -08:00

Main.h

Add single crunch command to aapt. do not merge.

2013-01-02 15:41:52 -08:00

NOTICE

…

Package.cpp

…

printapk.cpp

…

Resource.cpp

Fix writing text version of styleable IDs. do not merge.

2012-09-26 11:14:50 -07:00

ResourceFilter.cpp

…

ResourceFilter.h

…

ResourceIdCache.cpp

Cache resource ID lookups in aapt

2012-11-28 15:32:46 -08:00

ResourceIdCache.h

Cache resource ID lookups in aapt

2012-11-28 15:32:46 -08:00

ResourceTable.cpp

Cache resource ID lookups in aapt

2012-11-28 15:32:46 -08:00

ResourceTable.h

…

SourcePos.cpp

…

SourcePos.h

…

StringPool.cpp

…

StringPool.h

…

XMLNode.cpp

…

XMLNode.h

…

ZipEntry.cpp

…

ZipEntry.h

…

ZipFile.cpp

…

ZipFile.h

…