Andreas Gampe dc9c109af8 resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp ...

Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008

2014-11-07 15:14:02 -08: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 487ae9b8 to lmp-mr1-dev-plus-aosp

2014-11-07 15:14:02 -08: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