OSDN Git Service

am f4a785b4: resolved conflicts for merge of dce90517 to eclair-mr2
authorPatrick Scott <phanna@android.com>
Thu, 22 Oct 2009 13:40:21 +0000 (06:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Oct 2009 13:40:21 +0000 (06:40 -0700)
commit0e106a802df3689bdd9940dbc463fe8bef5b4b22
treef9f5827f5d28940b9d60de5c6078ea05cb4a47b9
parentb0c704ab60bc9bf7ea1d974f6c047b53a32b26bd
parentf4a785b4dc7b71bc7c3a0e398293f1050516c088
am f4a785b4: resolved conflicts for merge of dce90517 to eclair-mr2

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

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