Nick Kralevich 1cbea39fe1 resolved conflicts for merge of dd3d95f1 to klp-volantis-dev ...

Change-Id: I96c0f0da852a0b3cf8aef9158678d38aa30f456f

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

..

Asset.h

frameworks/base refactoring.

2012-02-17 19:01:26 -08:00

AssetDir.h

libutils clean-up

2013-05-07 17:09:46 -07:00

AssetManager.h

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

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

BackupHelpers.h

frameworks/base refactoring.

2012-02-17 19:01:26 -08:00

CursorWindow.h

move CursorWindow from libbinder to libandroidfw

2012-02-27 18:11:20 -08:00

misc.h

libutils clean-up

2013-05-07 17:09:46 -07:00

ObbFile.h

frameworks/base refactoring.

2012-02-17 19:01:26 -08:00

PowerManager.h

Move and rename user activity event type constants.

2012-07-27 18:14:56 -07:00

ResourceTypes.h

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

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

StreamingZipInflater.h

frameworks/base refactoring.

2012-02-17 19:01:26 -08:00

ZipFileRO.h

Reimplement ZipFileRO in terms of libziparchive.

2013-12-09 16:23:16 +00:00

ZipUtils.h

Reimplement ZipFileRO in terms of libziparchive.

2013-12-09 16:23:16 +00:00