Merge "resolve merge conflicts of bb3d77ba95 to master."

This commit is contained in:
Alex Klyubin
2016-01-22 19:14:52 +00:00
committed by Android (Google) Code Review

View File

@@ -22,6 +22,7 @@ PRODUCT_PACKAGES += \
adbd \ adbd \
atrace \ atrace \
bootanimation \ bootanimation \
bootstat \
cmd \ cmd \
debuggerd \ debuggerd \
dumpstate \ dumpstate \