OSDN Git Service

am e8d26685: resolved conflicts for merge of da3b21c3 to eclair-mr2
authorPatrick Scott <phanna@android.com>
Thu, 22 Oct 2009 18:07:36 +0000 (11:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Oct 2009 18:07:36 +0000 (11:07 -0700)
commitabb8a9ac668a4bea3446a1b102fc7fb2fee66613
tree0d8727985732beccb4b4cfb2bc9f07b39de2b479
parent89b92b434f4e239712de2bc1a10361ba6967bdc6
parente8d2668517e7e5b3e18f6c92949d2d4a673ec5b3
am e8d26685: resolved conflicts for merge of da3b21c3 to eclair-mr2

Merge commit 'e8d2668517e7e5b3e18f6c92949d2d4a673ec5b3' into eclair-mr2-plus-aosp

* commit 'e8d2668517e7e5b3e18f6c92949d2d4a673ec5b3':
  Show AM/PM in the same spot on the clock.