resolve merge conflicts of bb3d77ba95 to master.

Change-Id: Ib69e2a457c416b4da94fb76c231120632d47a07a
This commit is contained in:
Alex Klyubin
2016-01-22 11:05:03 -08:00

View File

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