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)
Merge commit '0e106a802df3689bdd9940dbc463fe8bef5b4b22'

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


Trivial merge