am 5e3ce397: resolved conflicts for merge of 854354be to honeycomb-plus-aosp

* commit '5e3ce3972c5f5245115c1f3ed95efab66150d457':
  Add swtmenubar.jar to SDK