OSDN Git Service

resolved conflicts for merge of 4e1b06eb to eclair-mr2
authorPatrick Scott <phanna@android.com>
Mon, 16 Nov 2009 19:28:05 +0000 (14:28 -0500)
committerPatrick Scott <phanna@android.com>
Mon, 16 Nov 2009 19:28:05 +0000 (14:28 -0500)
commit7e344f5d5bd60e275e4ccd87b6b34b1ae2c6d7d7
treee60b7c93554d6d16d638723887e04c4a1c54bea7
parenta092e9b25c45bfca849ffdd2bad3c65c8a29346e
parent4e1b06ebcf08dd57240a56bac6f923b2e72ea793
resolved conflicts for merge of 4e1b06eb to eclair-mr2
src/com/android/deskclock/AlarmClock.java