Nick Kralevich d5c8044e7e resolved conflicts for merge of 1cbea39f to master ...

Change-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700

2014-02-12 14:41:25 -08:00

..

tests

Extended locales in AAPT / AssetManager.

2014-02-10 15:50:16 +00:00

Android.mk

Add libutils dependency for libandroidfw host build.

2014-01-27 10:31:11 -08:00

Asset.cpp

Reimplement ZipFileRO in terms of libziparchive.

2014-01-27 10:31:11 -08:00

AssetDir.cpp

Revert "move libandroidfw to frameworks/native"

2014-01-27 10:31:10 -08:00

AssetManager.cpp

resolved conflicts for merge of 1cbea39f to master

2014-02-12 14:41:25 -08:00

BackupData.cpp

Revert "move libandroidfw to frameworks/native"

2014-01-27 10:31:10 -08:00

BackupHelpers.cpp

Revert "move libandroidfw to frameworks/native"

2014-01-27 10:31:10 -08:00

CursorWindow.cpp

Revert "move libandroidfw to frameworks/native"

2014-01-27 10:31:10 -08:00

misc.cpp

Revert "move libandroidfw to frameworks/native"

2014-01-27 10:31:10 -08:00

MODULE_LICENSE_APACHE2

Revert "move libandroidfw to frameworks/native"

2014-01-27 10:31:10 -08:00

NOTICE

Revert "move libandroidfw to frameworks/native"

2014-01-27 10:31:10 -08:00

ObbFile.cpp

Re-apply androidfw fixes lost by the directory rearrangement.

2014-01-27 10:31:10 -08:00

ResourceTypes.cpp

resolved conflicts for merge of 1cbea39f to master

2014-02-12 14:41:25 -08:00

StreamingZipInflater.cpp

Revert "move libandroidfw to frameworks/native"

2014-01-27 10:31:10 -08:00

ZipFileRO.cpp

Reimplement ZipFileRO in terms of libziparchive.

2014-01-27 10:31:11 -08:00

ZipUtils.cpp

Reimplement ZipFileRO in terms of libziparchive.

2014-01-27 10:31:11 -08:00