summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 6ee44d1: Merge change 1258 into donutAndroid (Google) Code Review2009-05-111-1/+1
|\
| * Fix 1840639 to support overlays with zz_ZZ.Robert Greenwalt2009-05-081-1/+1
* | merged 231cc608d06ffc31c24bf8aa8c8275bdd2636581Dianne Hackborn2009-05-061-16/+0
|\ \ | |/
| * Rewrite SyncStorageEngine to use flat files and in-memory data structures.Dianne Hackborn2009-05-051-16/+0
* | am 06d9602: Merge change 1000 into donutAndroid (Google) Code Review2009-05-052-1/+3
|\ \ | |/
| * Ignore layout bin directories in git.Raphael2009-05-052-1/+3
* | am 13735a2: Merge branch \'readonly-p4-donut\' into donutMitsuru Oshima2009-04-291-0/+8
|\ \ | |/
| * Merge branch 'readonly-p4-donut' into donutMitsuru Oshima2009-04-281-0/+8
| |\
| | * AI 147976: Compatibility mode support. Part 2.Mitsuru Oshima2009-04-281-0/+8
* | | am fd9b3c0: Merge change 570 into donutAndroid (Google) Code Review2009-04-291-0/+1
|\ \ \ | |/ /
| * | Add file to ignore the content of the layoutlib/Bridge Eclipe bin folder.Xavier Ducrohet2009-04-241-0/+1
| |/
| * AI 146485: am: CL 146411 Fix BridgeCanvas#drawRoundRectXavier Ducrohet2009-04-161-2/+2
| * AI 144547: Fix change 144342 by making it active only during overlay processing.Robert Greenwalt2009-04-031-2/+5
| * AI 144342: Fix bag (string-array,etc) behavior with overlays.Robert Greenwalt2009-04-022-4/+24
| * AI 144309: am: CL 144308 aapt extensions: required sdk version, dependent sof...Suchi Amalapurapu2009-04-021-69/+142
* | Merge branch 'readonly-p4-master'Marco Nelissen2009-04-204-13/+20
|\ \
| * | AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.Marco Nelissen2009-04-204-13/+20
* | | Merge branch 'readonly-p4-master'Xavier Ducrohet2009-04-181-2/+2
|\ \ \ | |/ /
| * | AI 146586: am: CL 146485 am: CL 146411 Fix BridgeCanvas#drawRoundRectXavier Ducrohet2009-04-181-2/+2
* | | Merge branch 'readonly-p4-master'Robert Greenwalt2009-04-031-2/+5
|\ \ \ | |/ /
| * | AI 144548: am: CL 144547 Fix change 144342 by making it active only during ov...Robert Greenwalt2009-04-031-2/+5
* | | Merge branch 'readonly-p4-master'Robert Greenwalt2009-04-022-4/+24
|\ \ \ | |/ /
| * | AI 144413: am: CL 144342 Fix bag (string-array,etc) behavior with overlays.Robert Greenwalt2009-04-022-4/+24
* | | Merge branch 'readonly-p4-master'Suchi Amalapurapu2009-04-021-69/+142
|\ \ \ | |/ /
| * | AI 144406: am: CL 144309 am: CL 144308 aapt extensions: required sdk version,...Suchi Amalapurapu2009-04-021-69/+142
| |/
* | Merge commit 'korg/cupcake'The Android Open Source Project2009-03-271-5/+6
|\ \ | |/
| * auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-181-5/+6
* | localize: include <cstdio> in files that uses the printf family ofScott Tsai2009-03-218-0/+8
* | Include stdio.h in tools/aidl/AST.h to make the code build on gcc-4.4Scott Tsai2009-03-211-0/+1
* | Merge commit 'remotes/korg/cupcake' into mergeJean-Baptiste Queru2009-03-1825-225/+784
|\ \ | |/
| * auto import from //branches/cupcake_rel/...@138607The Android Open Source Project2009-03-133-7/+85
| * auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-053-33/+47
| * auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03190-0/+42108
| * auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03190-42010/+0
| * auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-035-120/+22
| * auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-025-22/+120
| * auto import from //branches/cupcake/...@132569The Android Open Source Project2009-02-201-0/+10
| * auto import from //branches/cupcake/...@131421The Android Open Source Project2009-02-131-0/+6
| * auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-1019-165/+518
* | Removing "import" statements from AIDL-generated .java files.Adrian Taylor2009-02-132-20/+3
* | Merge branch 'cupcake'The Android Open Source Project2009-01-201-3/+2
|\ \ | |/
| * auto import from //branches/cupcake/...@127101The Android Open Source Project2009-01-201-3/+2
* | Merge branch 'cupcake'android-build SharedAccount2009-01-159-183/+373
|\ \ | |/
| * auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-159-183/+373
* | auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-0916-98/+611
|\ \ | |/
| * auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-0920-98/+616
* | Merge commit 'remotes/korg/cupcake'Jean-Baptiste Queru2008-12-1929-125/+547
|\ \ | |/
| * Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1729-126/+548
* | Fix typo. It's "picasa", not "picassa".raphael2008-10-281-1/+1
* | Add a few missing headers.Alexey Zaytsev2008-10-226-0/+8