]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1c4181 d0c4b81)
Merge commit 'remotes/korg/cupcake'
authorJean-Baptiste Queru <jbq@google.com>
Fri, 19 Dec 2008 16:31:54 +0000 (08:31 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 19 Dec 2008 16:31:54 +0000 (08:31 -0800)
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


Trivial merge
mirror of aapt