OSDN Git Service

am abb8a9ac: am e8d26685: resolved conflicts for merge of da3b21c3 to eclair-mr2
authorPatrick Scott <phanna@android.com>
Thu, 22 Oct 2009 18:17:52 +0000 (11:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Oct 2009 18:17:52 +0000 (11:17 -0700)
Merge commit 'abb8a9ac668a4bea3446a1b102fc7fb2fee66613'

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


Trivial merge