Jean-Baptiste Queru e1dc1d6dc8 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

2008-12-19 08:31:54 -08:00

..

aapt

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

aidl

Add a few missing headers

2008-10-21 23:52:01 +04:00

layoutlib

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

localize

Add a few missing headers.

2008-10-22 02:05:55 +04:00

makekeycodes

Initial Contribution

2008-10-21 07:00:00 -07:00

preload

Initial Contribution

2008-10-21 07:00:00 -07:00