OSDN Git Service

resolved conflicts for merge of da3b21c3 to eclair-mr2
authorPatrick Scott <phanna@android.com>
Thu, 22 Oct 2009 17:55:48 +0000 (13:55 -0400)
committerPatrick Scott <phanna@android.com>
Thu, 22 Oct 2009 17:55:48 +0000 (13:55 -0400)
commite8d2668517e7e5b3e18f6c92949d2d4a673ec5b3
tree0d8727985732beccb4b4cfb2bc9f07b39de2b479
parent2bf4d3b5418d7a4b43be184f5c5b18832bdc928c
parentda3b21c3fb5227cfabe7fefa777470d7a4604bb0
resolved conflicts for merge of da3b21c3 to eclair-mr2
src/com/android/deskclock/AlarmClock.java