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

..

tests

Add test to ensure themes get copied from separate resource tables

2014-08-29 14:34:54 -07:00

Android.mk

am 583a845c: am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."

2014-07-10 00:42:48 +00:00

Asset.cpp

…

AssetDir.cpp

…

AssetManager.cpp

Allow for appending of resources to an AssetManager.

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

BackupData.cpp

…

BackupHelpers.cpp

…

CursorWindow.cpp

…

misc.cpp

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

ObbFile.cpp

…

ResourceTypes.cpp

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

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

StreamingZipInflater.cpp

…

TypeWrappers.cpp

Fix build break in log statement

2014-06-18 13:00:28 -07:00

ZipFileRO.cpp

Update ziparchive usage to the new API.

2014-08-15 14:41:08 +01:00

ZipUtils.cpp

…