Kenny Root 461fa8b05d resolved conflicts for merge of 18490fb9 to master ...

Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37

2011-04-12 12:51:08 -07:00

..

tests/plurals

…

AaptAssets.cpp

Add new resource configurations for screen width/height in "dp".

2011-04-06 11:00:37 -07:00

AaptAssets.h

Add new resource configurations for screen width/height in "dp".

2011-04-06 11:00:37 -07:00

Android.mk

Fix linux 64 build

2010-08-24 20:20:50 -07:00

Bundle.h

Runtime resource overlay, iteration 1.

2011-04-01 14:12:10 +02:00

Command.cpp

am 0ccc8b73: am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread

2010-12-14 11:31:29 -08:00

Images.cpp

Give an 9-patch error on too many rows and columns

2010-03-12 14:12:14 -08:00

Images.h

…

Main.cpp

Runtime resource overlay, iteration 1.

2011-04-01 14:12:10 +02:00

Main.h

…

NOTICE

Add notice files for aapt and aidl.

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

Package.cpp

Change assets to use 64-bit API

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

printapk.cpp

…

Resource.cpp

am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."

2011-02-28 10:10:38 -08:00

ResourceTable.cpp

resolved conflicts for merge of 18490fb9 to master

2011-04-12 12:51:08 -07:00

ResourceTable.h

Add knowledge of mipmap to aapt

2010-11-22 22:28:44 -08: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 from aapt d

2011-01-04 20:52:08 +02:00

XMLNode.h

Add error checking for translatable strings

2010-06-03 09:33:43 -07:00

ZipEntry.cpp

…

ZipEntry.h

Add LFH offset to verbose list of APK

2010-08-25 07:38:33 -07:00

ZipFile.cpp

…

ZipFile.h

Fixes a few minor problems with AAPT

2010-06-25 11:02:15 +01:00