commit c0aa1e1b305d85baef1dcedabbea1d084f3ed54a
author Scott Main <smain@google.com> Fri Oct 15 11:20:26 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 15 11:20:26 2010 -0700
tree 8a6eea02c0d119b1c38ba004353914b55d78526c
parent e07a9d4aa4afd27461877fbfd4b132a5c6c34954
parent 5466af5017a5cf2de5aba7ea403627cb44763e68

Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index e1697d9..0b906e0 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -51,6 +51,7 @@
     libicuuc \
     libjavacore \
     libnativehelper \
+    libnfc_ndef \
     libsqlite_jni \
     libssl \
     libz \

target/product/sdk.mk

diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 3b99a69..d73e702 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -17,6 +17,7 @@
 PRODUCT_PROPERTY_OVERRIDES :=
 
 PRODUCT_PACKAGES := \
+	SystemUI \
 	AccountAndSyncSettings \
 	Camera \
 	Calculator \