Adam Lesinski e97908d32e Merge commit '0953ab27' into manualmerge ...

Change-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32

2014-12-05 11:06:21 -08:00

..

tests

Merge commit '06d8b7b8' into manualmerge

2014-11-17 12:17:16 -08:00

Android.mk

resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp

2014-11-07 15:14:02 -08:00

Asset.cpp

Frameworks/base: Wall Werror in libs/androidfw

2014-11-07 13:35:05 -08:00

AssetDir.cpp

…

AssetManager.cpp

Merge "RRO: prevent duplicate system overlays"

2014-12-03 17:44:18 +00:00

BackupData.cpp

Frameworks/base: Fix more warnings

2014-11-07 22:24:57 -08:00

BackupHelpers.cpp

bionic's struct stat is now POSIX-compliant.

2014-11-10 10:48:25 -08:00

CursorWindow.cpp

…

misc.cpp

Fix issues that will be present in C++11

2014-11-03 11:49:47 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

ObbFile.cpp

Frameworks/base: Wall Werror in libs/androidfw

2014-11-07 13:35:05 -08:00

ResourceTypes.cpp

Merge commit '0953ab27' into manualmerge

2014-12-05 11:06:21 -08:00

StreamingZipInflater.cpp

Frameworks/base: Wall Werror in libs/androidfw

2014-11-07 13:35:05 -08:00

TypeWrappers.cpp

Fix build break in log statement

2014-06-18 13:00:28 -07:00

ZipFileRO.cpp

Frameworks/base: Wall Werror in libs/androidfw

2014-11-07 13:35:05 -08:00

ZipUtils.cpp

…