OSDN Git Service

resolved conflicts for merge of dce90517 to eclair-mr2
authorPatrick Scott <phanna@android.com>
Thu, 22 Oct 2009 13:33:35 +0000 (09:33 -0400)
committerPatrick Scott <phanna@android.com>
Thu, 22 Oct 2009 13:33:35 +0000 (09:33 -0400)
commitf4a785b4dc7b71bc7c3a0e398293f1050516c088
treef9f5827f5d28940b9d60de5c6078ea05cb4a47b9
parent109d4af68f0536813786a2c4ca01a462f8755a88
parentdce90517954050428bfaf20e1409c10d372a4759
resolved conflicts for merge of dce90517 to eclair-mr2
src/com/android/deskclock/AlarmClock.java