Narayan Kamath b5c4e7fd38 resolved conflicts for merge of 92860a74 to master ...

Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e

2014-03-10 10:57:05 +00:00

..

tests

Extended locales in AAPT / AssetManager.

2014-02-14 14:08:57 +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

Extended locales in AAPT / AssetManager.

2014-02-14 14:08:57 +00:00

BackupData.cpp

Don't assume that we're at start of file at ctor time

2014-02-21 12:58:04 -08:00

BackupHelpers.cpp

Various format string fixes for 64bit

2014-02-24 17:39:46 +00: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

LP64: Make 9 patches architecture agnostic.

2014-03-10 10:00:02 +00: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