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

Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e

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

..

Asset.h

Revert "move libandroidfw to frameworks/native"

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

AssetDir.h

Revert "move libandroidfw to frameworks/native"

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

AssetManager.h

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

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

BackupHelpers.h

Revert "move libandroidfw to frameworks/native"

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

CursorWindow.h

Revert "move libandroidfw to frameworks/native"

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

misc.h

Revert "move libandroidfw to frameworks/native"

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

ObbFile.h

Revert "move libandroidfw to frameworks/native"

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

ResourceTypes.h

LP64: Make 9 patches architecture agnostic.

2014-03-10 10:00:02 +00:00

StreamingZipInflater.h

Revert "move libandroidfw to frameworks/native"

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

ZipFileRO.h

Reimplement ZipFileRO in terms of libziparchive.

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

ZipUtils.h

Reimplement ZipFileRO in terms of libziparchive.

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