]>
git.saurik.com Git - android/aapt.git/log
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:58 +0000 (17:56 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:34 +0000 (17:12 -0700)]
Merge donut into master
Marco Nelissen [Mon, 20 Apr 2009 23:17:25 +0000 (16:17 -0700)]
Merge branch 'readonly-p4-master'
Marco Nelissen [Mon, 20 Apr 2009 23:16:01 +0000 (16:16 -0700)]
AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.
The Android Open Source Project [Wed, 15 Apr 2009 01:18:03 +0000 (18:18 -0700)]
Merge commit 'korg/cupcake'
Robert Greenwalt [Wed, 8 Apr 2009 00:19:28 +0000 (17:19 -0700)]
AI 144950: Manual integration of 144342 and 144547 from donutburger to cupcake.
Fix bag (string-array, etc) behavior with overlays.
We used to replace elements in the default with elements from the
overlay. This change causes us to empty the array first so if the
overlay array is smaller we don't end up with elements from the
default array showing through at the end of the final result.
Ex: [A,B,C] default with [D] overlay should give [D] but used to
give [D,B,C]
BUG=
1754390
Automated import of CL 144950
Robert Greenwalt [Fri, 3 Apr 2009 23:46:32 +0000 (16:46 -0700)]
Merge branch 'readonly-p4-master'
Robert Greenwalt [Fri, 3 Apr 2009 23:45:18 +0000 (16:45 -0700)]
AI 144548: am: CL 144547 Fix change 144342 by making it active only during overlay processing.
Robert Greenwalt [Fri, 3 Apr 2009 23:44:30 +0000 (16:44 -0700)]
AI 144547: Fix change 144342 by making it active only during overlay processing.
BUG=
1754390
Automated import of CL 144547
Robert Greenwalt [Fri, 3 Apr 2009 06:37:35 +0000 (23:37 -0700)]
Merge branch 'readonly-p4-master'
Robert Greenwalt [Fri, 3 Apr 2009 06:36:26 +0000 (23:36 -0700)]
AI 144413: am: CL 144342 Fix bag (string-array,etc) behavior with overlays.
Suchi Amalapurapu [Fri, 3 Apr 2009 06:19:43 +0000 (23:19 -0700)]
Merge branch 'readonly-p4-master'
Suchi Amalapurapu [Fri, 3 Apr 2009 06:18:34 +0000 (23:18 -0700)]
AI 144406: am: CL 144309 am: CL 144308 aapt extensions: required sdk version, dependent software libraries, gadgets
Add new attributes for sdk version, software libs and gadgets
BUG =
1730924
Original author: asuchitra
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 144406
Robert Greenwalt [Thu, 2 Apr 2009 23:55:50 +0000 (16:55 -0700)]
AI 144342: Fix bag (string-array,etc) behavior with overlays.
We used to replace elements in the default with elements from
the overlay. This change causes us to empty the array first
so if the overlay array is smaller we don't end up with elements
from the default array showing through at the end of the array.
Ex: [A,B,C] and overlay [D] should give [D] but used to give
[D,B,C].
BUG=
1754390
Automated import of CL 144342
Suchi Amalapurapu [Thu, 2 Apr 2009 22:20:29 +0000 (15:20 -0700)]
AI 144309: am: CL 144308 aapt extensions: required sdk version, dependent software libraries, gadgets
Add new attributes for sdk version, software libs and gadgets
BUG =
1730924
Original author: asuchitra
Merged from: //branches/cupcake/...
Automated import of CL 144309
Suchi Amalapurapu [Thu, 2 Apr 2009 22:19:31 +0000 (15:19 -0700)]
AI 144308: aapt extensions: required sdk version, dependent software libraries, gadgets
Add new attributes for sdk version, software libs and gadgets
BUG =
1730924
BUG=
1730924
Automated import of CL 144308
Jean-Baptiste Queru [Wed, 18 Mar 2009 18:33:14 +0000 (11:33 -0700)]
Merge commit 'remotes/korg/cupcake' into merge
The Android Open Source Project [Thu, 5 Mar 2009 22:34:35 +0000 (14:34 -0800)]
auto import from //depot/cupcake/@136594
The Android Open Source Project [Wed, 4 Mar 2009 03:31:44 +0000 (19:31 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:45 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 3 Mar 2009 22:04:24 +0000 (14:04 -0800)]
auto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 06:54:33 +0000 (22:54 -0800)]
auto import from //depot/cupcake/@137055
The Android Open Source Project [Fri, 20 Feb 2009 15:38:31 +0000 (07:38 -0800)]
auto import from //branches/cupcake/...@132569
The Android Open Source Project [Tue, 10 Feb 2009 23:44:00 +0000 (15:44 -0800)]
auto import from //branches/cupcake/...@130745
The Android Open Source Project [Tue, 20 Jan 2009 22:05:35 +0000 (14:05 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Tue, 20 Jan 2009 22:03:58 +0000 (14:03 -0800)]
auto import from //branches/cupcake/...@127101
android-build SharedAccount [Fri, 16 Jan 2009 00:16:01 +0000 (16:16 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Fri, 16 Jan 2009 00:12:10 +0000 (16:12 -0800)]
auto import from //branches/cupcake/...@126645
The Android Open Source Project [Sat, 10 Jan 2009 02:24:37 +0000 (18:24 -0800)]
auto import from //branches/cupcake/...@125939
The Android Open Source Project [Sat, 10 Jan 2009 01:51:23 +0000 (17:51 -0800)]
auto import from //branches/cupcake/...@125939
Jean-Baptiste Queru [Fri, 19 Dec 2008 16:31:54 +0000 (08:31 -0800)]
Merge commit 'remotes/korg/cupcake'
The Android Open Source Project [Thu, 18 Dec 2008 02:05:43 +0000 (18:05 -0800)]
Code drop from //branches/cupcake/...@124589
raphael [Tue, 28 Oct 2008 21:44:31 +0000 (14:44 -0700)]
Fix typo. It's "picasa", not "picassa".
The Android Open Source Project [Tue, 21 Oct 2008 14:00:00 +0000 (07:00 -0700)]
Initial Contribution
projects / android / aapt.git / log
