resolved conflicts for merge of 9f312b81 to jb-dev-plus-aosp

Change-Id: I4589e38d0a2d35f84f16e00dd9cffa02b25ebf98
This commit is contained in:
Jean-Baptiste Queru 2012-05-25 07:16:04 -07:00
commit 4261ace013
1 changed files with 0 additions and 3 deletions

View File

@ -20,9 +20,6 @@
# in inherited configurations.
PRODUCT_PACKAGES := \
drmserver \
libdrmframework \
libdrmframework_jni \
libfwdlockengine \
OpenWnn \
PinyinIME \