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

…

Bundle.h

Runtime resource overlay, iteration 1.

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

Command.cpp

…

Images.cpp

…

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

…

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

…

SourcePos.cpp

…

SourcePos.h

…

StringPool.cpp

…

StringPool.h

…

XMLNode.cpp

…

XMLNode.h

…

ZipEntry.cpp

…

ZipEntry.h

…

ZipFile.cpp

…

ZipFile.h

…