Dan Albert 20ec4fa229 resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp ...

Change-Id: I5a25f2bac44ac5efcd7462af91005e09680a1d96

2014-09-08 22:25:54 -07: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

Allow for appending of resources to an AssetManager.

2014-07-17 18:10:02 +01:00

BackupHelpers.h

Revert "move libandroidfw to frameworks/native"

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

ByteBucketArray.h

Support multiple resource tables with same package

2014-06-18 19:20:08 +00: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

resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp

2014-09-08 22:25:54 -07:00

StreamingZipInflater.h

Revert "move libandroidfw to frameworks/native"

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

TypeWrappers.h

Support multiple resource tables with same package

2014-06-18 19:20:08 +00: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