Adam Lesinski 685d363d7a Merge commit 'fb96e54' into manualmerge ...

Conflicts:
	tools/aapt/Resource.cpp

Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15

2014-11-05 12:30:25 -08:00

..

tests

Merge commit '78be0498' into manualmerge

2014-11-03 18:06:22 -08:00

Android.mk

Merge commit '78be0498' into manualmerge

2014-11-03 18:06:22 -08:00

Asset.cpp

…

AssetDir.cpp

…

AssetManager.cpp

…

BackupData.cpp

…

BackupHelpers.cpp

…

CursorWindow.cpp

…

misc.cpp

Fix issues that will be present in C++11

2014-11-03 11:49:47 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

ObbFile.cpp

…

ResourceTypes.cpp

Add error checking to aapt for split generation

2014-11-03 15:55:44 -08:00

StreamingZipInflater.cpp

…

TypeWrappers.cpp

…

ZipFileRO.cpp

…

ZipUtils.cpp

…