OSDN Git Service

resolved conflicts for merge of 90c4833f to eclair-mr2
authorPatrick Scott <phanna@android.com>
Wed, 2 Dec 2009 13:16:25 +0000 (08:16 -0500)
committerPatrick Scott <phanna@android.com>
Wed, 2 Dec 2009 13:16:25 +0000 (08:16 -0500)
commitc3f77cc16633551c4daf1c160f4655762dda9a3b
treedd28e749b11a338c34a1f23d249977dd6f7b2095
parent527e80b4b4395a6b205b4bc4a35f3004ec3702ce
parent90c4833f94f4775f747333f8bd67107364a1d9c1
resolved conflicts for merge of 90c4833f to eclair-mr2
src/com/android/deskclock/AlarmClock.java
src/com/android/deskclock/SetAlarm.java