Ying Wang 9a5418bba5 resolved conflicts for merge of f83fd362 to master ...

Change-Id: I527111ec1461e258b4911a2aaa90100eceacea80

2010-06-09 11:48:48 -07:00

..

acp

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

apicheck

am 58248935: am cf28b803: am ae4e1455: merge from open-source master

2010-05-03 16:16:25 -07:00

apriori

Automated import from //branches/master/...@142824,142824

2009-03-25 18:09:52 -07:00

atree

Support absolute path, in OUT_DIR

2009-11-08 13:19:45 -08:00

bin2asm

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

check_prereq

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

dexpreopt

Use ARCH_ARM_HAVE_ARMV7A to select qemu kernel for dexpreopt

2010-03-10 16:07:26 -08:00

droiddoc

Revamp resources listing, part 2 (droiddoc).

2010-06-04 10:51:02 -07:00

fs_config

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

fs_get_stats

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

iself

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

isprelinked

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

kcm

kcm tool fix for the keyboard output permissions

2009-08-27 18:16:25 -05:00

lsd

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

releasetools

am 5324cb81: am ed661dd6: am 1d37a0da: am 2ea21065: add metadata to OTA package in easily-parsed form

2010-05-02 16:15:40 -07:00

rgb2565

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

signapk

fix endianness problem with the tail of the signature comment

2009-08-14 17:15:46 -07:00

soslim

Automated import from //branches/donutburger/...@141285,141285

2009-03-24 19:58:48 -07:00

zipalign

Make zipalign build for the Win SDK under Linux.

2010-04-23 13:15:37 -07:00

adbs

Flush every line of output.

2009-08-31 13:38:35 -07:00

Android.mk

Unbundle the build system.

2010-06-09 10:26:26 -07:00

buildinfo.sh

Support secondary CPU ABI in build.prop

2009-11-06 15:12:00 -08:00

check_builds.sh

AI 146824: am: CL 146738 am: CL 146687 The maps and gtalkservice libraries were still being included in

2009-04-18 22:36:21 -07:00

compare_fileslist.py

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

dump-package-stats

allow use of unzip version 6.0

2009-11-09 18:19:48 -08:00

event_log_tags.py

allow EventLog tag numbers to be auto-assigned

2010-02-16 14:32:08 -08:00

fileslist.py

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

findleaves.py

joeo here -- pesky findleaves.sh wasn't pruning directories.

2009-08-11 15:05:59 -07:00

fixlinebreaks.sh

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

java-event-log-tags.py

allow java eventlogtags to be generated for packages that aren't included

2010-02-17 09:07:55 -08:00

merge-event-log-tags.py

Allow explicit and implicit numbering of the same tag.

2010-03-17 16:59:12 -07:00

mktarball.sh

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

print_module_licenses.sh

auto import from //depot/cupcake/@135843

2009-03-03 19:28:42 -08:00

warn.py

Update warn.py with more warnings

2010-03-10 16:16:02 -08:00