Dan Albert 8ab25d82b5 resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp ...

Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c

2014-09-19 16:13:49 -07:00

..

tests

AAPT: Filtering resource fix

2014-08-22 16:09:54 -07:00

AaptAssets.cpp

Stamp platform version code into app Apks

2014-08-27 18:28:49 -07:00

AaptAssets.h

Stamp platform version code into app Apks

2014-08-27 18:28:49 -07:00

AaptConfig.cpp

Introduce anydpi density resource qualifier

2014-08-25 17:47:30 -07:00

AaptConfig.h

…

AaptUtil.cpp

…

AaptUtil.h

…

AaptXml.cpp

Stamp platform version code into app Apks

2014-08-27 18:28:49 -07:00

AaptXml.h

Stamp platform version code into app Apks

2014-08-27 18:28:49 -07:00

Android.mk

resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp

2014-09-19 16:13:49 -07:00

ApkBuilder.cpp

Ensure that split names are valid

2014-08-14 19:29:47 +00:00

ApkBuilder.h

Ensure that split names are valid

2014-08-14 19:29:47 +00:00

Bundle.h

Stamp platform version code into app Apks

2014-08-27 18:28:49 -07:00

CacheUpdater.h

…

Command.cpp

am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the onResourcesLoaded callback." into lmp-dev

2014-09-11 18:49:07 +00:00

ConfigDescription.h

…

CrunchCache.cpp

…

CrunchCache.h

…

DirectoryWalker.h

…

FileFinder.cpp

…

FileFinder.h

…

Images.cpp

Fix nine patch outline radius computation

2014-08-15 00:41:09 +00:00

Images.h

…

IndentPrinter.h

Have R classes generate their own reference rewrite logic

2014-08-25 20:04:07 -07:00

Main.cpp

AAPT support for feature splits

2014-08-04 18:48:14 -07:00

Main.h

Stamp platform version code into app Apks

2014-08-27 18:28:49 -07:00

NOTICE

…

OutputSet.h

…

Package.cpp

…

printapk.cpp

…

pseudolocalize.cpp

…

pseudolocalize.h

…

qsort_r_compat.c

…

qsort_r_compat.h

…

Resource.cpp

am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev

2014-09-19 19:08:50 +00:00

ResourceFilter.cpp

AAPT: Filtering resource fix

2014-08-22 16:09:54 -07:00

ResourceFilter.h

AAPT: Filtering resource fix

2014-08-22 16:09:54 -07:00

ResourceIdCache.cpp

am de86cf13: am 5a6934c0: Merge "Don\'t pollute the namespace for two uses."

2014-09-09 05:19:06 +00:00

ResourceIdCache.h

…

ResourceTable.cpp

am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev

2014-09-19 19:08:50 +00:00

ResourceTable.h

Fix backwards compat problem with AAPT public attrs

2014-09-18 14:05:24 -07:00

SourcePos.cpp

…

SourcePos.h

…

StringPool.cpp

resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp

2014-09-08 22:25:54 -07:00

StringPool.h

Use char16_t for char things.

2014-09-08 18:30:08 -07:00

WorkQueue.cpp

…

WorkQueue.h

…

XMLNode.cpp

Use char16_t for char things.

2014-09-08 18:30:08 -07:00

XMLNode.h

…

ZipEntry.cpp

…

ZipEntry.h

…

ZipFile.cpp

…

ZipFile.h

…