Adam Lesinski 63377406f7 am 8e5362f2: am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" ...

* commit '8e5362f20e2bc41b1dcf130a613b7e0b3cd1db58':
  RRO: prevent duplicate system overlays

2014-12-04 16:17:12 +00: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

am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c

2014-12-03 00:30:56 +00:00

StreamingZipInflater.cpp

Frameworks/base: Wall Werror in libs/androidfw

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

TypeWrappers.cpp

…

ZipFileRO.cpp

Frameworks/base: Wall Werror in libs/androidfw

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

ZipUtils.cpp

…