Elliott Hughes 4b0ee78bfa resolved conflicts for merge of 56ca8219 to master ...

Change-Id: I62f5804a5c4404eedce09188cda2e3b1bb990b36

2014-04-18 16:07:41 -07:00

..

tests

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

AaptAssets.cpp

am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev

2014-04-04 19:34:11 +00:00

AaptAssets.h

Shared library resource support

2014-03-25 12:09:56 -07:00

Android.mk

Exclude the host aapt and aidl from PDK build.

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

Bundle.h

resolved conflicts for merge of 56ca8219 to master

2014-04-18 16:07:41 -07:00

CacheUpdater.h

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

Command.cpp

resolved conflicts for merge of 56ca8219 to master

2014-04-18 16:07:41 -07:00

CrunchCache.cpp

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

CrunchCache.h

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

DirectoryWalker.h

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

FileFinder.cpp

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

FileFinder.h

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

Images.cpp

resolved conflicts for merge of 92860a74 to master

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

Images.h

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

Main.cpp

Shared library resource support

2014-03-25 12:09:56 -07:00

Main.h

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

NOTICE

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

Package.cpp

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

printapk.cpp

Shared library resource support

2014-03-25 12:09:56 -07:00

pseudolocalize.cpp

Pseudolocalizer improvements.

2014-04-09 16:59:48 -07:00

pseudolocalize.h

Pseudolocalizer improvements.

2014-04-09 16:59:48 -07:00

qsort_r_compat.c

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

qsort_r_compat.h

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

Resource.cpp

Add --replace-version flag to aapt.

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

ResourceFilter.cpp

Pseudolocalizer improvements.

2014-04-09 16:59:48 -07:00

ResourceFilter.h

Pseudolocalizer improvements.

2014-04-09 16:59:48 -07:00

ResourceIdCache.cpp

Shared library resource support

2014-03-25 12:09:56 -07:00

ResourceIdCache.h

Shared library resource support

2014-03-25 12:09:56 -07:00

ResourceTable.cpp

resolved conflicts for merge of 56ca8219 to master

2014-04-18 16:07:41 -07:00

ResourceTable.h

Shared library resource support

2014-03-25 12:09:56 -07:00

SourcePos.cpp

Reduce warning verbosity in aapt

2014-03-24 10:50:34 -07:00

SourcePos.h

Reduce warning verbosity in aapt

2014-03-24 10:50:34 -07:00

StringPool.cpp

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

StringPool.h

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

WorkQueue.cpp

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

WorkQueue.h

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

XMLNode.cpp

Pseudolocalizer improvements.

2014-04-09 16:59:48 -07:00

XMLNode.h

Pseudolocalizer improvements.

2014-04-09 16:59:48 -07:00

ZipEntry.cpp

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

ZipEntry.h

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

ZipFile.cpp

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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

ZipFile.h

Revert "Move frameworks/base/tools/ to frameworks/tools/"

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