Xavier Ducrohet a125c937de resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp ...

Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe

2011-07-20 16:31:25 -07:00

..

tests/plurals

…

AaptAssets.cpp

resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

2011-07-20 16:31:25 -07:00

AaptAssets.h

resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

2011-07-20 16:31:25 -07:00

Android.mk

…

Bundle.h

Add dependency generation to Aapt for R.java

2011-06-27 16:44:57 -07:00

Command.cpp

resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

2011-07-20 16:31:25 -07:00

Images.cpp

…

Images.h

…

Main.cpp

Add generation of dependency file for .ap_ package

2011-07-18 16:37:55 -07:00

Main.h

Add generation of dependency file for .ap_ package

2011-07-18 16:37:55 -07:00

NOTICE

Add notice files for aapt and aidl.

2011-02-28 18:36:41 -08:00

Package.cpp

resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

2011-07-20 16:31:25 -07:00

printapk.cpp

…

Resource.cpp

resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

2011-07-20 16:31:25 -07:00

ResourceTable.cpp

am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles.

2011-06-10 07:45:38 -07:00

ResourceTable.h

Enforce public resource restriction on bag parents.

2011-06-09 15:27:39 -07:00

SourcePos.cpp

…

SourcePos.h

…

StringPool.cpp

Change assets to use 64-bit API

2010-12-08 11:21:30 -08:00

StringPool.h

…

XMLNode.cpp

Normalize output of XMLtree content

2011-04-11 13:32:19 +03:00

XMLNode.h

…

ZipEntry.cpp

…

ZipEntry.h

…

ZipFile.cpp

…

ZipFile.h

Add generation of dependency file for .ap_ package

2011-07-18 16:37:55 -07:00