diff options
author | Ying Wang <wangying@google.com> | 2014-07-17 14:51:13 -0700 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2014-07-17 14:51:13 -0700 |
commit | 06940df71383b5acfdfdf9d4d4cf6e30090dfa7c (patch) | |
tree | 3dec4976a79dc86d925302f642bccc0a572dfe8d /target/product | |
parent | f551abc4fcffb7d6aad112deb3c21fe4fa602925 (diff) | |
parent | ef44fb2d7b6f417a0391a5b6ce2993c234885633 (diff) | |
download | build-06940df71383b5acfdfdf9d4d4cf6e30090dfa7c.zip build-06940df71383b5acfdfdf9d4d4cf6e30090dfa7c.tar.gz build-06940df71383b5acfdfdf9d4d4cf6e30090dfa7c.tar.bz2 |
resolved conflicts for merge of ef44fb2d to lmp-dev-plus-aosp
Change-Id: I5551e6b1303f2b37d199a1b894f37c50839fdecc
Diffstat (limited to 'target/product')
-rw-r--r-- | target/product/embedded.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/target/product/embedded.mk b/target/product/embedded.mk index b60c948..6575ba5 100644 --- a/target/product/embedded.mk +++ b/target/product/embedded.mk @@ -23,7 +23,6 @@ PRODUCT_PACKAGES += \ atrace \ bootanimation \ debuggerd \ - debuggerd64 \ dumpstate \ dumpsys \ gralloc.default \ @@ -57,7 +56,6 @@ PRODUCT_PACKAGES += \ libui \ libutils \ linker \ - linker64 \ lmkd \ logcat \ logwrapper \ |