Chih-Hung Hsieh 56996ff61e resolve merge conflicts of 76ce8e5 to stage-aosp-master am: ed935c32f4 ...

am: ef57a0d629

Change-Id: Ifcc24ad835f2e74a25954bf3fd7090c75abdc084

2016-08-12 00:40:25 +00:00

..

tests

…

AaptAssets.cpp

Merge "Do not stack allocate RefBase object in AaptAssets::filter"

2016-08-11 17:28:07 +00:00

AaptAssets.h

Fix clang-tidy warnings in libs/hwui.

2016-08-10 23:26:59 +00:00

AaptConfig.cpp

…

AaptConfig.h

…

AaptUtil.cpp

…

AaptUtil.h

…

AaptXml.cpp

…

AaptXml.h

…

Android.mk

Add bound checks to utf16_to_utf8

2016-07-14 13:27:53 +00:00

ApkBuilder.cpp

…

ApkBuilder.h

…

Bundle.h

AAPT: ProGuard config for components in main dex.

2016-04-27 19:50:55 +00:00

CacheUpdater.h

…

Command.cpp

AAPT: faketouch feature implied if no touchscreen feature requested.

2016-08-01 17:20:28 -07:00

ConfigDescription.h

…

CrunchCache.cpp

…

CrunchCache.h

…

DirectoryWalker.h

…

FileFinder.cpp

…

FileFinder.h

…

Images.cpp

AAPT: Don't keep processing files that failed to be added

2016-07-18 17:07:41 -07:00

Images.h

…

IndentPrinter.h

…

Main.cpp

AAPT: ProGuard config for components in main dex.

2016-04-27 19:50:55 +00:00

Main.h

AAPT: ProGuard config for components in main dex.

2016-04-27 19:50:55 +00:00

NOTICE

…

OutputSet.h

…

Package.cpp

Don't try to compress .mkv resources

2016-04-04 15:39:40 +09:00

pseudolocalize.cpp

…

pseudolocalize.h

…

Resource.cpp

AAPT: Don't keep processing files that failed to be added

2016-07-18 17:07:41 -07:00

ResourceFilter.cpp

Don't match locales with different scripts in ResourceFilter

2016-06-21 15:03:51 -07:00

ResourceFilter.h

…

ResourceIdCache.cpp

…

ResourceIdCache.h

…

ResourceTable.cpp

AAPT: Fix feature split generation of ID resources

2016-08-03 16:54:15 -07:00

ResourceTable.h

…

SdkConstants.h

…

SourcePos.cpp

…

SourcePos.h

…

StringPool.cpp

Fix misc-macro-parentheses warnings in aapt and androidfw.

2016-05-19 15:19:22 -07:00

StringPool.h

…

Symbol.h

…

WorkQueue.cpp

…

WorkQueue.h

…

XMLNode.cpp

…

XMLNode.h

…

ZipEntry.cpp

…

ZipEntry.h

…

ZipFile.cpp

…

ZipFile.h

…