Dan Albert 9488813873 am 7a79c4ca: am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-master ...

* commit '7a79c4cac3b0c722832e868346db2375b6d6c379':
  Stop using namespace std.

2015-03-05 23:56:53 +00:00

..

tests

Parse res-car as resources for UI_MODE_TYPE_CAR..

2015-02-10 16:11:55 +00:00

AaptAssets.cpp

Parse res-car as resources for UI_MODE_TYPE_CAR..

2015-02-10 16:11:55 +00:00

AaptAssets.h

First commit of split-select tool

2014-10-23 10:39:31 -07:00

AaptConfig.cpp

AAPT: Use the right enum when checking for density configurations

2015-01-22 18:19:44 -08:00

AaptConfig.h

Add error checking to aapt for split generation

2014-11-03 15:55:44 -08:00

AaptUtil.cpp

…

AaptUtil.h

Build the split-select tool without C++11 support

2014-11-03 12:09:58 -08:00

AaptXml.cpp

Add appropriate casts for char16_t.

2014-11-20 11:47:40 -08:00

AaptXml.h

…

Android.mk

resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp

2014-11-12 13:24:42 -08:00

ApkBuilder.cpp

…

ApkBuilder.h

…

Bundle.h

AAPT: Copy android:revisionCode to Splits

2014-12-16 09:16:26 -08:00

CacheUpdater.h

Fix automerge issue

2014-11-03 20:35:54 -08:00

Command.cpp

am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev

2015-02-10 20:14:44 +00:00

ConfigDescription.h

First commit of split-select tool

2014-10-23 10:39:31 -07:00

CrunchCache.cpp

…

CrunchCache.h

…

DirectoryWalker.h

…

FileFinder.cpp

…

FileFinder.h

…

Images.cpp

Stop using namespace std.

2015-03-04 13:54:20 -08:00

Images.h

…

IndentPrinter.h

…

Main.cpp

am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0

2015-01-08 20:24:33 +00:00

Main.h

…

NOTICE

…

OutputSet.h

…

Package.cpp

…

printapk.cpp

…

pseudolocalize.cpp

…

pseudolocalize.h

…

Resource.cpp

am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev

2014-12-16 18:02:09 +00:00

ResourceFilter.cpp

AAPT: Ignore densities specified in -c flag

2014-11-10 17:56:11 -08:00

ResourceFilter.h

…

ResourceIdCache.cpp

First commit of split-select tool

2014-10-23 10:39:31 -07:00

ResourceIdCache.h

…

ResourceTable.cpp

resolved conflicts for merge of 701f9c2f to stage-aosp-master

2015-03-05 15:41:39 -08:00

ResourceTable.h

resolved conflicts for merge of 701f9c2f to stage-aosp-master

2015-03-05 15:41:39 -08:00

SdkConstants.h

AAPT: Handle all old unversioned attribute usage

2015-01-14 12:02:15 -08:00

SourcePos.cpp

Add error checking to aapt for split generation

2014-11-03 15:55:44 -08:00

SourcePos.h

Add error checking to aapt for split generation

2014-11-03 15:55:44 -08:00

StringPool.cpp

Merge commit '78be0498' into manualmerge

2014-11-03 18:06:22 -08:00

StringPool.h

Merge commit '78be0498' into manualmerge

2014-11-03 18:06:22 -08:00

Symbol.h

Add error checking to aapt for split generation

2014-11-03 15:55:44 -08:00

WorkQueue.cpp

…

WorkQueue.h

…

XMLNode.cpp

Fix issues that will be present in C++11

2014-11-03 11:49:47 -08:00

XMLNode.h

…

ZipEntry.cpp

kill HAVE_LOCALTIME_R

2014-11-13 09:57:22 -08:00

ZipEntry.h

…

ZipFile.cpp

…

ZipFile.h

…