Narayan Kamath b5c4e7fd38 resolved conflicts for merge of 92860a74 to master ...

Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e

2014-03-10 10:57:05 +00:00

..

tests

…

AaptAssets.cpp

am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."

2014-02-17 11:06:38 +00:00

AaptAssets.h

am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."

2014-02-17 11:06:38 +00:00

Android.mk

Exclude the host aapt and aidl from PDK build.

2014-03-07 15:56:14 -08:00

Bundle.h

Add --replace-version flag to aapt.

2014-02-25 13:42:12 -08:00

CacheUpdater.h

…

Command.cpp

resolved conflicts for merge of a81ee86b to master

2014-03-07 23:04:03 -08:00

CrunchCache.cpp

…

CrunchCache.h

…

DirectoryWalker.h

…

FileFinder.cpp

…

FileFinder.h

…

Images.cpp

resolved conflicts for merge of 92860a74 to master

2014-03-10 10:57:05 +00:00

Images.h

…

Main.cpp

Add --replace-version flag to aapt.

2014-02-25 13:42:12 -08:00

Main.h

…

NOTICE

…

Package.cpp

…

printapk.cpp

…

pseudolocalize.cpp

…

pseudolocalize.h

…

qsort_r_compat.c

…

qsort_r_compat.h

…

Resource.cpp

Add --replace-version flag to aapt.

2014-02-25 13:42:12 -08:00

ResourceFilter.cpp

Extended locales in AAPT / AssetManager.

2014-02-14 14:08:57 +00:00

ResourceFilter.h

Extended locales in AAPT / AssetManager.

2014-02-14 14:08:57 +00:00

ResourceIdCache.cpp

…

ResourceIdCache.h

Extended locales in AAPT / AssetManager.

2014-02-14 14:08:57 +00:00

ResourceTable.cpp

Extended locales in AAPT / AssetManager.

2014-02-14 14:08:57 +00: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

…