Chih-Hung Hsieh ef57a0d629 resolve merge conflicts of 76ce8e5 to stage-aosp-master ...

am: ed935c32f4

Change-Id: Ibb7415686469d7b15e8dbe0cd04226c4e0cd7d76

2016-08-12 00:31:29 +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: ProGuard config for components in main dex.

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

ConfigDescription.h

…

CrunchCache.cpp

…

CrunchCache.h

…

DirectoryWalker.h

…

FileFinder.cpp

…

FileFinder.h

…

Images.cpp

Work-around paletted image decoding bug in SDK_JELLYBEAN

2016-03-16 18:36:06 -04: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

Track rename from base/ to android-base/.

2015-12-04 15:33:35 -08:00

Resource.cpp

Stop emitting javadoc for @removed attributes.

2016-05-09 14:51:41 +01:00

ResourceFilter.cpp

…

ResourceFilter.h

…

ResourceIdCache.cpp

…

ResourceIdCache.h

…

ResourceTable.cpp

AAPT: Allow duplicate attribute definitions if identical

2016-02-26 15:57:59 -08:00

ResourceTable.h

AAPT: Allow duplicate attribute definitions if identical

2016-02-26 15:57:59 -08:00

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

Implement AAPT Bundle format

2015-11-30 14:43:43 -08:00

XMLNode.h

Implement AAPT Bundle format

2015-11-30 14:43:43 -08:00

ZipEntry.cpp

…

ZipEntry.h

…

ZipFile.cpp

…

ZipFile.h

…