drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,907 Commits 1 Branch 0 Tags
Commit Graph

3602 Commits

Author SHA1 Message Date
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