Yusuke Sato 53a19bb967 resolved conflicts for merge of d3d6e9a3 to mnc-dev-plus-aosp ...

Change-Id: Ie32db11e6c1062df32b16a5cd6fcd219e0bdc017

2015-06-29 13:09:51 -07:00

..

tests

Add -round and -notround qualifier to android runtime/aapt

2015-05-15 15:10:58 -07:00

Android.mk

Add a static dependency on libbase.

2015-04-29 14:07:41 +00:00

Asset.cpp

ZipFileRO: Use precise widths for zip file types.

2015-06-17 13:13:16 +00:00

AssetDir.cpp

…

AssetManager.cpp

ZipFileRO: Use precise widths for zip file types.

2015-06-17 13:13:16 +00:00

BackupData.cpp

…

BackupHelpers.cpp

Add payload-size preflight stage to full transport backup

2015-03-26 18:57:36 -07:00

CursorWindow.cpp

…

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

Add -round and -notround qualifier to android runtime/aapt

2015-05-15 15:10:58 -07:00

StreamingZipInflater.cpp

…

TypeWrappers.cpp

…

ZipFileRO.cpp

resolved conflicts for merge of d3d6e9a3 to mnc-dev-plus-aosp

2015-06-29 13:09:51 -07:00

ZipUtils.cpp

…