From: Jean-Baptiste Queru <jbq@google.com>
Date: Fri, 19 Dec 2008 16:31:54 +0000 (-0800)
Subject: Merge commit 'remotes/korg/cupcake'
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/3c80e5c0dc993f14ed11bca00e023ce8c073a7f4?hp=--cc

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
---

3c80e5c0dc993f14ed11bca00e023ce8c073a7f4