resolved conflicts for merge of 9f312b81
to jb-dev-plus-aosp
Change-Id: I4589e38d0a2d35f84f16e00dd9cffa02b25ebf98
This commit is contained in:
@@ -20,9 +20,6 @@
|
|||||||
# in inherited configurations.
|
# in inherited configurations.
|
||||||
|
|
||||||
PRODUCT_PACKAGES := \
|
PRODUCT_PACKAGES := \
|
||||||
drmserver \
|
|
||||||
libdrmframework \
|
|
||||||
libdrmframework_jni \
|
|
||||||
libfwdlockengine \
|
libfwdlockengine \
|
||||||
OpenWnn \
|
OpenWnn \
|
||||||
PinyinIME \
|
PinyinIME \
|
||||||
|
Reference in New Issue
Block a user