Nick Kralevich 1cbea39fe1 resolved conflicts for merge of dd3d95f1 to klp-volantis-dev ...

Change-Id: I96c0f0da852a0b3cf8aef9158678d38aa30f456f

2014-02-12 14:08:06 -08:00

..

tests

Reimplement ZipFileRO in terms of libziparchive.

2013-12-09 16:23:16 +00:00

Android.mk

Add libutils dependency for libandroidfw host build.

2013-12-11 16:48:07 +00:00

Asset.cpp

Reimplement ZipFileRO in terms of libziparchive.

2013-12-09 16:23:16 +00:00

AssetDir.cpp

…

AssetManager.cpp

resolved conflicts for merge of dd3d95f1 to klp-volantis-dev

2014-02-12 14:08:06 -08:00

BackupData.cpp

…

BackupHelpers.cpp

…

CursorWindow.cpp

Move input library code to frameworks/native.

2013-07-01 20:11:42 -07:00

misc.cpp

libutils clean-up

2013-05-07 17:09:46 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

ObbFile.cpp

Fix a variety of small publicly-reported bugs.

2013-10-29 13:12:55 -07:00

ResourceTypes.cpp

Runtime resource overlay, iteration 2

2014-02-03 11:20:30 +01:00

StreamingZipInflater.cpp

…

ZipFileRO.cpp

Reimplement ZipFileRO in terms of libziparchive.

2013-12-09 16:23:16 +00:00

ZipUtils.cpp

Reimplement ZipFileRO in terms of libziparchive.

2013-12-09 16:23:16 +00:00