Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e3ce397 authored by Raphael's avatar Raphael
Browse files

resolved conflicts for merge of 854354be to honeycomb-plus-aosp

Change-Id: Iabd1ac0b63276067b094939b237c6e695fff0c9f
parents e615e851 854354be
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ PRODUCT_PACKAGES += \
	sdklib \
	sdkuilib \
	sdkmanager \
	swtmenubar \
	swing-worker-1.1 \
	groovy-all-1.7.0 \
	commons-compress-1.0 \
	emmalib \