OSDN Git Service

am 7e344f5d: resolved conflicts for merge of 4e1b06eb to eclair-mr2
authorPatrick Scott <phanna@android.com>
Mon, 16 Nov 2009 22:39:21 +0000 (14:39 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Nov 2009 22:39:21 +0000 (14:39 -0800)
commit6142aa5a0e025d65b6a4d152e1570b31e0991c5c
treee60b7c93554d6d16d638723887e04c4a1c54bea7
parent0ff25c6f3d22e31f5ab42a16fc04098b3705fc73
parent7e344f5d5bd60e275e4ccd87b6b34b1ae2c6d7d7
am 7e344f5d: resolved conflicts for merge of 4e1b06eb to eclair-mr2

Merge commit '7e344f5d5bd60e275e4ccd87b6b34b1ae2c6d7d7' into eclair-mr2-plus-aosp

* commit '7e344f5d5bd60e275e4ccd87b6b34b1ae2c6d7d7':
  New UI for the list of alarms.