resolved conflicts for merge of 854354be
to honeycomb-plus-aosp
Change-Id: Iabd1ac0b63276067b094939b237c6e695fff0c9f
This commit is contained in:
commit
5e3ce3972c
1 changed files with 2 additions and 0 deletions
|
@ -100,6 +100,8 @@ PRODUCT_PACKAGES += \
|
|||
sdklib \
|
||||
sdkuilib \
|
||||
sdkmanager \
|
||||
swtmenubar \
|
||||
swing-worker-1.1 \
|
||||
groovy-all-1.7.0 \
|
||||
commons-compress-1.0 \
|
||||
emmalib \
|
||||
|
|
Loading…
Reference in a new issue