fix bad merge conflict resolution

Change-Id: I56c885df873ff6281f62a5c4e5d4db19138b591d
This commit is contained in:
Colin Cross 2014-03-21 17:41:26 -07:00
parent f2b60c0f80
commit cf1f9d2d67

View file

@ -59,7 +59,7 @@ PRODUCT_PACKAGES += \
screencap \ screencap \
sensorservice \ sensorservice \
uiautomator \ uiautomator \
uncrypt uncrypt \
webview webview
# The order of PRODUCT_BOOT_JARS matters. # The order of PRODUCT_BOOT_JARS matters.