OSDN Git Service

resolved conflicts for merge of e3f01aff to eclair-mr2
authorPatrick Scott <phanna@android.com>
Mon, 16 Nov 2009 21:23:49 +0000 (16:23 -0500)
committerPatrick Scott <phanna@android.com>
Mon, 16 Nov 2009 21:23:49 +0000 (16:23 -0500)
commitf6f1e5d224b8522d6f62ece1dff4180b381f2a47
treeb512df8207453ca7f9c743e5b24cc817f804ad00
parent7a46bb83334a88c39c288f51196da424cbfb9adc
parente3f01aff06d4bddb09215ccad3d8502de9164966
resolved conflicts for merge of e3f01aff to eclair-mr2
src/com/android/deskclock/AlarmClock.java