George Burgess IV ea4423b181 Merge "Fix a static-analyzer warning." ...

am: 63b4f6f5db

Change-Id: I85fd6d25733d59da76eb0bab381fdbd3b5a0430d

2016-10-20 19:19:15 +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

Fix a static-analyzer warning.

2016-10-13 15:52:34 -07:00

xml

…

Android.mk

Merge "Rely on the platform -std default." am: 66f15cc01b am: 5a989a504a

2016-10-08 22:03:56 +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