OSDN Git Service

resolved conflicts for merge of aafb2fd2 to eclair-mr2
authorPatrick Scott <phanna@android.com>
Mon, 19 Oct 2009 20:37:42 +0000 (16:37 -0400)
committerPatrick Scott <phanna@android.com>
Mon, 19 Oct 2009 20:37:42 +0000 (16:37 -0400)
commit2eb3900c6917520f546f44e4d9ca6f045cffe9ea
tree0d6369cb4bae1fa97bb1dac5ba8046c9e6daab8e
parent3dbaa9d07abf3133024bac468e452a071f270fac
parentaafb2fd272f3c97f74043c11469ad301d3bd4026
resolved conflicts for merge of aafb2fd2 to eclair-mr2
src/com/android/deskclock/AlarmAlertFullScreen.java
src/com/android/deskclock/AlarmClock.java