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

Change-Id: Ifedb15de5a4db6cb0238fec93aaa2d95f1844694

2014-09-19 15:50:13 -07:00

..

tests

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

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

androidfw: resolve 64-bit build issues

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

AssetDir.cpp

Revert "move libandroidfw to frameworks/native"

2014-01-27 10:31:10 -08:00

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

Revert "move libandroidfw to frameworks/native"

2014-01-27 10:31:10 -08:00

MODULE_LICENSE_APACHE2

Revert "move libandroidfw to frameworks/native"

2014-01-27 10:31:10 -08:00

NOTICE

Revert "move libandroidfw to frameworks/native"

2014-01-27 10:31:10 -08:00

ObbFile.cpp

Re-apply androidfw fixes lost by the directory rearrangement.

2014-01-27 10:31:10 -08:00

ResourceTypes.cpp

am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev

2014-09-19 19:08:50 +00:00

StreamingZipInflater.cpp

Revert "move libandroidfw to frameworks/native"

2014-01-27 10:31:10 -08:00

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