Adam Lesinski 9438ad1599 am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c ...

* commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets

2014-12-02 23:07:43 +00:00

..

tests

Merge commit '06d8b7b8' into manualmerge

2014-11-17 12:17:16 -08:00

Android.mk

resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp

2014-11-07 15:14:02 -08:00

Asset.cpp

Frameworks/base: Wall Werror in libs/androidfw

2014-11-07 13:35:05 -08:00

AssetDir.cpp

Revert "move libandroidfw to frameworks/native"

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

AssetManager.cpp

Merge changes If2c7e09f,Ie21f227c

2014-12-02 22:52:37 +00:00

BackupData.cpp

Frameworks/base: Fix more warnings

2014-11-07 22:24:57 -08:00

BackupHelpers.cpp

bionic's struct stat is now POSIX-compliant.

2014-11-10 10:48:25 -08: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

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

Frameworks/base: Wall Werror in libs/androidfw

2014-11-07 13:35:05 -08:00

ResourceTypes.cpp

am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c

2014-12-02 23:07:43 +00:00

StreamingZipInflater.cpp

Frameworks/base: Wall Werror in libs/androidfw

2014-11-07 13:35:05 -08:00

TypeWrappers.cpp

Fix build break in log statement

2014-06-18 13:00:28 -07:00

ZipFileRO.cpp

Frameworks/base: Wall Werror in libs/androidfw

2014-11-07 13:35:05 -08:00

ZipUtils.cpp

androidfw: resolve 64-bit build issues

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