509 Commits

Author SHA1 Message Date
The Android Open Source Project
9266c558bf auto import from //branches/cupcake/...@126645 2009-01-15 16:12:10 -08:00
The Android Open Source Project
e570a0fa86 auto import from //branches/cupcake/...@125939 2009-01-09 18:24:37 -08:00
The Android Open Source Project
b798689749 auto import from //branches/cupcake/...@125939 2009-01-09 17:51:23 -08:00
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
The Android Open Source Project
f013e1afd1 Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
raphael
9b68d54c0e Fix typo. It's "picasa", not "picassa". 2008-10-28 14:44:31 -07:00
Alexey Zaytsev
862bfdba15 Add a few missing headers.
Fixes build with gcc 4.3.2 on Debian.

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
2008-10-22 02:05:55 +04:00
Alexey Zaytsev
0aa7fe6876 Add a few missing headers
Fixes build with gcc 4.3.2

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
2008-10-21 23:52:01 +04:00
The Android Open Source Project
54b6cfa9a9 Initial Contribution 2008-10-21 07:00:00 -07:00