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

* commit '5e3ce3972c5f5245115c1f3ed95efab66150d457':
  Add swtmenubar.jar to SDK
This commit is contained in:
Raphael 2011-04-15 17:25:55 -07:00 committed by Android Git Automerger
commit 6d3bbf5678

View file

@ -100,6 +100,8 @@ PRODUCT_PACKAGES += \
sdklib \
sdkuilib \
sdkmanager \
swtmenubar \
swing-worker-1.1 \
groovy-all-1.7.0 \
commons-compress-1.0 \
emmalib \