]>
git.saurik.com Git - android/aapt.git/log
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
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
