]>
git.saurik.com Git - android/aapt.git/log
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Jean-Baptiste Queru [Wed, 18 Mar 2009 18:33:14 +0000 (11:33 -0700)] 
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
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'
Conflicts:
core/java/com/android/internal/app/AlertController.java
core/res/res/values/strings.xml
media/java/android/media/AudioSystem.java
services/java/com/android/server/LocationManagerService.java
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
