OSDN Git Service

am 0e106a80: am f4a785b4: resolved conflicts for merge of dce90517 to eclair-mr2
authorPatrick Scott <phanna@android.com>
Thu, 22 Oct 2009 13:46:16 +0000 (06:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Oct 2009 13:46:16 +0000 (06:46 -0700)
commitec09c51336d50b80f1f864b7f9d6746d5d79e2fa
treef9f5827f5d28940b9d60de5c6078ea05cb4a47b9
parent4cc82d761f95753c101173b6635a7900b1047326
parent0e106a802df3689bdd9940dbc463fe8bef5b4b22
am 0e106a80: am f4a785b4: resolved conflicts for merge of dce90517 to eclair-mr2

Merge commit '0e106a802df3689bdd9940dbc463fe8bef5b4b22'

* commit '0e106a802df3689bdd9940dbc463fe8bef5b4b22':
  Remove the menu and replace with buttons.