Mark Salyzyn db15537e6e resolve merge conflicts of 082a1721b516 to master ...

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e

2017-01-11 08:30:17 -08:00

..

include/androidfw

resolve merge conflicts of 082a1721b516 to master

2017-01-11 08:30:17 -08:00

tests

libandroidfw: Revert null check in ApplyStyle

2017-01-06 16:51:48 -08:00

.clang-format

Add tests for attribute resolution

2016-10-17 18:33:42 -07:00

Android.bp

Convert libandroidfw to Android.bp

2016-12-02 11:23:12 -08:00

Android.mk

Convert libandroidfw to Android.bp

2016-12-02 11:23:12 -08:00

Asset.cpp

Fix race with Asset destruction and printing allocation stats am: 2582465bb4

2016-10-18 20:53:59 +00:00

AssetDir.cpp

…

AssetManager.cpp

Allow persistent changes to the vendor overlay theme

2016-11-07 20:46:07 -05:00

AttributeResolution.cpp

libandroidfw: Revert null check in ApplyStyle

2017-01-06 16:51:48 -08:00

BackupData.cpp

Replace cutils/log.h and log/logger.h with log/log.h

2017-01-09 14:31:34 -08:00

BackupHelpers.cpp

Replace cutils/log.h and log/logger.h with log/log.h

2017-01-09 14:31:34 -08:00

CursorWindow.cpp

…

DisplayEventDispatcher.cpp

…

LocaleData.cpp

…

LocaleDataTables.cpp

…

misc.cpp

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

ObbFile.cpp

…

ResourceTypes.cpp

Merge "Fix incorrect calculation of sizeof package structure" am: 757e286cc8 am: 530fdccbe4 am: 2f176bb2cd

2016-11-18 23:00:15 +00:00

StreamingZipInflater.cpp

…

TypeWrappers.cpp

…

ZipFileRO.cpp

…

ZipUtils.cpp

…