The Android Open Source Project
7547115694
Merge branch 'cupcake'
2009-01-20 14:05:35 -08:00
The Android Open Source Project
22f7dfd234
auto import from //branches/cupcake/...@127101
2009-01-20 14:03:58 -08:00
android-build SharedAccount
0fda766e53
Merge branch 'cupcake'
2009-01-15 16:16:01 -08:00
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
Jeyprakash
5aa6bb1edd
Avoid using the 'sample' syntax to refer to Phone Application, in the core.
...
This adds a build dependency on the PhoneApp, and the core build fails on
configurations that do not have Phone Application.
Build Error:
frameworks/base/core/java/android/widget/TwoLineListItem.java:31: error 2: Error reading file for include "" packages/apps/Phone/res/layout/dialer_list_item.xml
2008-11-22 15:00:24 -08:00
The Android Open Source Project
54b6cfa9a9
Initial Contribution
2008-10-21 07:00:00 -07:00
