OSDN Git Service

am 1f61ad17: (-s ours) am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were...
authorJustin Ho <justinho@google.com>
Tue, 26 Oct 2010 23:10:57 +0000 (16:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 26 Oct 2010 23:10:57 +0000 (16:10 -0700)
commit6bdf5c39d80efaba9142b87d27a3d09457edd967
tree00537ae5a80c56ef8a7a8ab7835aebed5f7f2dc7
parenta8413beb39b6b75e9b77ded4388e73f22bda556e
parent1f61ad1728b56960d08b4ba8b90dbc4127ae1a0b
am 1f61ad17: (-s ours) am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread