Adam Lesinski a76db13fb0 am 347040cf: am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev ...

* commit '347040cf84401601b0d5cbb1d76e4648d1c8a461':
  Fix issue where non-resource attributes would cause obtainStyleAttributes to fail

2014-12-11 01:38:33 +00:00

..

tests

am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev

2014-12-11 00:07:02 +00: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

…

AssetManager.cpp

Merge "RRO: prevent duplicate system overlays"

2014-12-03 17:44:18 +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

…

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

Frameworks/base: Wall Werror in libs/androidfw

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

ResourceTypes.cpp

am e97908d3: Merge commit \'0953ab27\' into manualmerge

2014-12-05 19:16:27 +00:00

StreamingZipInflater.cpp

Frameworks/base: Wall Werror in libs/androidfw

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

TypeWrappers.cpp

…

ZipFileRO.cpp

Frameworks/base: Wall Werror in libs/androidfw

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

ZipUtils.cpp

…