tree 143eadc7f8ae3e8462ea597bbc0e051c93a3491c
parent 0963ed73d33ba972a4ce51ca7e0cf9e1b19e6339
parent 4af9ce060d71cb2774731dcc48f844ef9b7145d5
author Adam Powell <adamp@google.com> 1314134213 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314134213 -0700

am 4af9ce06: Merge "Fix bug 5202226 - Leave menu button visible for no-button phones if targetSdk < ICS"

* commit '4af9ce060d71cb2774731dcc48f844ef9b7145d5':
  Fix bug 5202226 - Leave menu button visible for no-button phones if targetSdk < ICS