Aurimas Liutikas 4b0b52c257 resolve merge conflicts of 69895b1 to master ...

Change-Id: I8f35e5a9c549b8f486dbeca07fc32c0f2fdab296

2016-11-18 17:00:30 -08:00

..

apkcheck

Replace custom rules, remove ACP

2016-03-23 13:22:38 -07:00

axl

…

checkstyle

Split android-style.xml into modules for checkstyle.

2016-11-18 15:55:15 -08:00

emulator

chmod a-x on files that shouldn't be executable

2015-08-25 17:42:52 -07:00

etc1tool

Remove unused libhost dependency

2016-02-29 19:56:40 -08:00

extract

Tool to extract annotations from the framework

2016-07-06 09:33:19 -07:00

findunused

Fix findunusedresources to handle package name different from path

2012-01-27 16:07:59 -08:00

hosttestlib

Change hosttestlib to use ddm-prebuilt.

2010-09-21 11:44:23 -07:00

idegen

Idegen: Don't assume a backslash is preceded by a space

2016-04-15 14:06:53 -07:00

labpretest

Replace use of ro.monkey with ro.test_harness.

2011-01-09 14:11:50 -08:00

line_endings

…

mkstubs

Upgrade to ASM 5

2016-02-09 19:10:46 -08:00

privapp_permissions

Added privapp_permissions.py tool

2016-11-14 15:02:10 -08:00

recovery_l10n/res

Remove dead translations. am: 39a86fa

2016-03-27 15:46:18 +00:00

rmtypedefs

Replace custom rules, remove ACP

2016-03-23 13:22:38 -07:00

templates

Update default project icons, and add an xhdpi version

2011-12-16 15:21:12 -08:00

make_key

Switch from SHA-1 to SHA-256 for new signing key certs.

2016-02-17 13:19:41 -08:00