Adam Lesinski 1adf320606 am 8491c4ea: Merge "Merge commit \'fb96e54\' into manualmerge" into lmp-mr1-dev-plus-aosp ...

* commit '8491c4ead7dba5cfd406cf99a511fc1dce07cc4d':
  Add error checking to aapt for split generation

2014-11-05 20:35:27 +00: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

androidfw: resolve 64-bit build issues

2014-03-19 11:11:14 -07:00

AssetDir.cpp

…

AssetManager.cpp

Allow for appending of resources to an AssetManager.

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

BackupData.cpp

resolved conflicts for merge of 22d07464 to master

2014-03-27 14:22:47 +00:00

BackupHelpers.cpp

AArch64: Make frameworks/base code more portable

2014-03-27 12:30:42 +00:00

CursorWindow.cpp

AArch64: Make frameworks/base code more portable

2014-03-27 12:30:42 +00:00

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

am 8491c4ea: Merge "Merge commit \'fb96e54\' into manualmerge" into lmp-mr1-dev-plus-aosp

2014-11-05 20:35:27 +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

androidfw: resolve 64-bit build issues

2014-03-19 11:11:14 -07:00