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)
commit6554b90fa23a378edf4da6626c4506394d80ee7b
tree0d8727985732beccb4b4cfb2bc9f07b39de2b479
parent427eb2e5e4034358599d057bd3ccd15f90fa34fb
parentabb8a9ac668a4bea3446a1b102fc7fb2fee66613
am abb8a9ac: am e8d26685: resolved conflicts for merge of da3b21c3 to eclair-mr2

Merge commit 'abb8a9ac668a4bea3446a1b102fc7fb2fee66613'

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