Dan Albert ece13f90ed resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aosp ...

Change-Id: I9d0f81003f84d03a7a67420dd496fde18dd654d4

2014-09-19 15:37:15 -07:00

..

tests

resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aosp

2014-09-19 15:37:15 -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

am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev

2014-09-19 18:37:15 +00: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

…