resolve merge conflicts of 179c0d8 to stage-aosp-master

Change-Id: Iba5aec266444cabf83f600f2bdb45a3c027e5995
2016-06-15 15:22:17 -07:00
parent 2fc7cd69fd 179c0d80bc
commit 274d17dc0f
16 changed files with 250 additions and 1498 deletions
@@ -37,8 +37,6 @@
 #include "minui/minui.h"
 #include "minzip/SysUtil.h"
 #include "minzip/Zip.h"
-#include "mtdutils/mounts.h"
-#include "mtdutils/mtdutils.h"
 #include "roots.h"
 #include "ui.h"
 #include "verifier.h"