]> git.saurik.com Git - android/aapt.git/commit
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)
commit3c80e5c0dc993f14ed11bca00e023ce8c073a7f4
tree993ca1945e84570633e57904f03efe3ed00130f8
parente1c41813542c55b42c893cbf7bdfc7371389efef
parentd0c4b8109ffb0ad08dcbf29203c71af10715fd87
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