Adam Lesinski 705f2ac424 am 879f237a: Merge "Added some more Split density tests" into lmp-mr1-dev ...

automerge: 93b43445

* commit '93b434451abd11ff58ada66abdcddb3f33bb5023':
  Added some more Split density tests

2014-10-24 02:01:16 +00:00

..

tests

am 879f237a: Merge "Added some more Split density tests" into lmp-mr1-dev

2014-10-24 02:01:16 +00:00

Android.mk

am 3d23d557: am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES."

2014-10-21 16:11:52 +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 983b668b: am be003a35: am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev

2014-10-10 17:14:41 +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