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

Change-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700

2014-02-12 14:41:25 -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

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

resolved conflicts for merge of 1cbea39f to master

2014-02-12 14:41:25 -08: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