Chih-Hung Hsieh 85e0c89ba5 resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp ...

Change-Id: I90807581e10b6a0024515ff634ac8b29eaa5fc9f

2016-04-28 12:08:15 -07:00

..

tests

Merge "ZipUtils: Fix wrong timestamps when getEntryInfo" am: 3f0355f

2016-04-28 12:26:53 +00:00

Android.mk

Add choreographer API to the NDK.

2016-04-08 16:55:02 +02:00

Asset.cpp

Cleanup uses of sprintf so we can deprecate it.

2016-03-02 13:34:44 -08:00

AssetDir.cpp

…

AssetManager.cpp

Optimize ResTable::getLocales() to improve bindApplication performance

2016-04-18 15:06:50 -07:00

BackupData.cpp

Frameworks/base: Fix more warnings

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

BackupHelpers.cpp

Cleanup uses of sprintf so we can deprecate it.

2016-03-02 13:34:44 -08:00

CursorWindow.cpp

…

DisplayEventDispatcher.cpp

Add choreographer API to the NDK.

2016-04-08 16:55:02 +02:00

LocaleData.cpp

Make default resources a better match for en-US requests

2016-02-01 14:56:52 -08:00

LocaleDataTables.cpp

Implement smarter locale resource selection

2016-01-21 13:47:22 -08:00

misc.cpp

am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK."

2015-01-13 01:32:37 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

ObbFile.cpp

fix compiler error under FORTIFY_SOURCE=2

2015-04-24 20:27:06 -07:00

ResourceTypes.cpp

resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

2016-04-28 12:08:15 -07:00

StreamingZipInflater.cpp

Frameworks/base: Wall Werror in libs/androidfw

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

TypeWrappers.cpp

…

ZipFileRO.cpp

Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP)

2015-08-05 14:41:52 -07:00

ZipUtils.cpp

Fix google-explicit-constructor warnings.

2016-04-27 11:38:12 -07:00