| commit | 772a89695f179b51d16b26c1b0d946aa3e850e70 | [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 | 9a9fdadd1301625f875a3c126c986c79e3363ac4 | |
| parent | d34e59679f6a98e9e67ef4bd18da6e5a86d386bc [diff] | |
| parent | e09fd9e819c23dc90bca68375645e15544861330 [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