| commit | e1dc1d6dc8064740b78562c3028ccc526a44597e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Dec 19 08:31:54 2008 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Dec 19 08:31:54 2008 -0800 |
| tree | 522e5c9636d4c174aca3b7a649b7cbf5d96f8dae | |
| parent | f066bbedcf17d85f3a2bec3958afdf3f5790a9c7 [diff] | |
| parent | f013e1afd1e68af5e3b868c26a653bbfb39538f8 [diff] |
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