resolve merge conflicts of bb3d77ba95 to master.

Change-Id: Ib69e2a457c416b4da94fb76c231120632d47a07a
2016-01-22 11:05:03 -08:00
parent f2ca92d9c4 bb3d77ba95
commit 24b1c64c5b
1 changed files with 1 additions and 0 deletions
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -22,6 +22,7 @@ PRODUCT_PACKAGES += \
    adbd \
    atrace \
    bootanimation \
+    bootstat \
    cmd \
    debuggerd \
    dumpstate \