Commit Graph

75 Commits

Author SHA1 Message Date
Raphael
1bb52f2587 Fix ADT junit test for AndroidManifestParser following API change. 2009-05-05 13:41:59 -07:00
Xavier Ducrohet
a0385be052 am 1ec5e2f: Move ADT to 0.9.1
Merge commit '1ec5e2f4bb6ac9b5954558033894a5c95e14d7a1'

* commit '1ec5e2f4bb6ac9b5954558033894a5c95e14d7a1':
  Move ADT to 0.9.1
2009-04-29 12:06:41 -07:00
Xavier Ducrohet
1ec5e2f4bb Move ADT to 0.9.1 2009-04-27 19:02:03 -07:00
Brett Chabot
a947f8ed5c Merge branch 'readonly-p4-master' 2009-04-02 23:24:44 -07:00
Brett Chabot
90d63fa3a4 AI 144408: am: CL 144322 am: CL 144320 ADT: Fix debugger launch connection when debugging Android JUnit
Original author: brettchabot
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144408
2009-04-02 23:23:38 -07:00
Brett Chabot
6bc8491396 AI 144322: am: CL 144320 ADT: Fix debugger launch connection when debugging Android JUnit
Original author: brettchabot
  Merged from: //branches/cupcake/...

Automated import of CL 144322
2009-04-02 15:37:39 -07:00
The Android Open Source Project
3838ad5b07 Merge commit 'korg/cupcake' 2009-03-27 15:30:35 -07:00
Ricky Ng-Adam
0a001932dc Automated import from //branches/master/...@141414,141414 2009-03-24 20:14:26 -07:00
Ricky Ng-Adam
bbf8acf406 Automated import from //branches/donutburger/...@141413,141413 2009-03-24 20:14:25 -07:00
The Android Open Source Project
b0bdccc71a auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:36 -07:00
The Android Open Source Project
6ffae015b4 auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:43 -07:00
Jean-Baptiste Queru
3e2a2d312a Merge commit 'remotes/korg/cupcake' into cupcake_to_master 2009-03-18 16:57:28 -07:00
The Android Open Source Project
243d18eb22 auto import from //branches/cupcake/...@137873 2009-03-11 12:11:54 -07:00
The Android Open Source Project
692ab02175 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:11 -07:00
The Android Open Source Project
52d4c30ca5 auto import from //depot/cupcake/@135843 2009-03-03 19:29:09 -08:00
The Android Open Source Project
d4aee0c0ca auto import from //depot/cupcake/@135843 2009-03-03 18:28:16 -08:00
The Android Open Source Project
e3c5766074 auto import from //branches/cupcake/...@130745 2009-02-10 15:43:58 -08:00
The Android Open Source Project
2d6668aaf0 Merge branch 'cupcake' 2009-01-20 14:05:23 -08:00
The Android Open Source Project
7b53e39377 auto import from //branches/cupcake/...@127101 2009-01-20 14:03:55 -08:00
The Android Open Source Project
e60601ff6b auto import from //branches/cupcake/...@125939 2009-01-09 18:26:25 -08:00
The Android Open Source Project
95cf464c5a auto import from //branches/cupcake/...@125939 2009-01-09 17:51:19 -08:00
Jean-Baptiste Queru
303a8c73c9 Merge commit 'remotes/korg/cupcake'
Conflicts:
	build/sdk.atree
	ide/eclipse/.classpath
	tools/activitycreator/src/com/android/activitycreator/ActivityCreator.java
	tools/eclipse/scripts/create_adt_symlinks.sh
	tools/eclipse/scripts/create_all_symlinks.sh
	tools/eclipse/scripts/create_bridge_symlinks.sh
	tools/eclipse/scripts/create_common_symlinks.sh
	tools/eclipse/scripts/create_ddms_symlinks.sh
	tools/eclipse/scripts/create_editors_symlinks.sh
	tools/eclipse/scripts/create_test_symlinks.sh
	tools/scripts/build.template
2008-12-19 08:04:59 -08:00
The Android Open Source Project
e943f2fd8e Code drop from //branches/cupcake/...@124589 2008-12-17 18:04:04 -08:00
ralf
70af177cf3 Fix create_ddms_symlinks to create libs/ correctly.
Add git ignore files to avoid all build files from being submitted to git.
2008-12-05 12:36:27 -08:00
The Android Open Source Project
5c11852110 Initial Contribution 2008-10-21 07:00:00 -07:00