Initial Contribution
Initial Contribution
Merge
Code drop from //branches/cupcake/...@124589
Merge commit 'remotes/korg/cupcake'

Conflicts:
	phone/com/android/internal/policy/impl/PhoneWindowManager.java
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
auto import from //branches/cupcake/...@125939
auto import from //branches/cupcake/...@125939
auto import from //branches/cupcake/...@126645
Merge branch 'cupcake'
Merge branch 'cupcake'
Merge branch 'master' of git://android.git.kernel.org/platform/frameworks/policies/base
auto import from //branches/cupcake/...@127101
Merge branch 'cupcake'
auto import from //branches/cupcake/...@127436
Merge branch 'cupcake'
Merge branch 'cupcake'
Add missing <limits.h> include

This should fix the build for gcc 4.3.2
Merge
AAPT needs a buffer larger than 1 MB on the host to decode resources.arsc from SDK/android.jar.
This leaves the asset unzip buffer to 1 MB on the device and 2 MB on the host.