Chih-Hung Hsieh 84717d4118 resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3 ...

am: c76aa69207

Change-Id: I6bb066d131dde297612c5dcbf5051f4964e62a8b

2016-08-12 19:35:08 +00:00

..

compile

AAPT2: Add diff command

2016-04-30 01:36:12 +00:00

diff

AAPT2: Add diff command

2016-04-30 01:36:12 +00:00

dump

…

filter

…

flatten

…

integration-tests

…

io

…

java

Stop emitting javadoc for @removed attributes.

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

link

Allow uses-library under <application>

2016-06-02 23:57:55 +00:00

process

…

proto

AAPT2: Add diff command

2016-04-30 01:36:12 +00:00

split

…

test

…

unflatten

…

util

Add bound checks to utf16_to_utf8

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

xml

…

Android.mk

Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite am: 2005edf642

2016-08-01 23:46:15 +00:00

AppInfo.h

…

ConfigDescription_test.cpp

…

ConfigDescription.cpp

…

ConfigDescription.h

resolve merge conflicts of 17bd236 to stage-aosp-master

2016-08-12 11:44:16 -07:00

Debug.cpp

…

Debug.h

…

Diagnostics.h

…

Flags.cpp

…

Flags.h

…

Format.proto

…

Locale_test.cpp

…

Locale.cpp

…

Locale.h

…

Main.cpp

AAPT2: Add diff command

2016-04-30 01:36:12 +00:00

NameMangler_test.cpp

…

NameMangler.h

…

public_attr_map.py

…

Resource_test.cpp

…

Resource.cpp

…

Resource.h

resolve merge conflicts of 17bd236 to stage-aosp-master

2016-08-12 11:44:16 -07:00

ResourceParser_test.cpp

…

ResourceParser.cpp

Fix clang-tidy warnings in aapt and aapt2.

2016-08-11 15:20:10 -07:00

ResourceParser.h

Fix clang-tidy warnings in aapt and aapt2.

2016-08-11 15:20:10 -07:00

ResourceTable_test.cpp

…

ResourceTable.cpp

resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3

2016-08-12 19:35:08 +00:00

ResourceTable.h

resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3

2016-08-12 19:35:08 +00:00

ResourceUtils_test.cpp

…

ResourceUtils.cpp

AAPT2: Add diff command

2016-04-30 01:36:12 +00:00

ResourceUtils.h

…

ResourceValues.cpp

AAPT2: Add diff command

2016-04-30 01:36:12 +00:00

ResourceValues.h

resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3

2016-08-12 19:35:08 +00:00

SdkConstants_test.cpp

…

SdkConstants.cpp

resolve merge conflicts of 17bd236 to stage-aosp-master

2016-08-12 11:44:16 -07:00

SdkConstants.h

resolve merge conflicts of 17bd236 to stage-aosp-master

2016-08-12 11:44:16 -07:00

Source.h

…

StringPool_test.cpp

…

StringPool.cpp

…

StringPool.h

resolve merge conflicts of 17bd236 to stage-aosp-master

2016-08-12 11:44:16 -07:00

ValueVisitor_test.cpp

…

ValueVisitor.h

AAPT2: Add diff command

2016-04-30 01:36:12 +00:00