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