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

Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7

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

..

tests/plurals

…

AaptAssets.cpp

…

AaptAssets.h

…

Android.mk

Fix linux 64 build

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

Bundle.h

Add an aapt option to allow string variations for different devices.

2010-09-23 10:32:47 -07:00

Command.cpp

am 31103928: am 192b56d4: Merge "Implement #2964234: Add support for <uses-package> element to aapt" into gingerbread

2010-09-02 17:59:51 -07:00

Images.cpp

…

Images.h

…

Main.cpp

Add an aapt option to allow string variations for different devices.

2010-09-23 10:32:47 -07:00

Main.h

…

Package.cpp

…

printapk.cpp

…

Resource.cpp

am fa888784: am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"

2010-09-10 15:01:56 -07:00

ResourceTable.cpp

resolved conflicts for merge of 10d5b096 to master

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

ResourceTable.h

…

SourcePos.cpp

…

SourcePos.h

…

StringPool.cpp

…

StringPool.h

…

XMLNode.cpp

am d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false", not "true"." into gingerbread

2010-08-16 07:49:51 -07:00

XMLNode.h

…

ZipEntry.cpp

…

ZipEntry.h

Add LFH offset to verbose list of APK

2010-08-25 07:38:33 -07:00

ZipFile.cpp

…

ZipFile.h

…