From: Ying Wang Date: Thu, 27 Aug 2015 01:38:15 +0000 (+0000) Subject: am 4fc14679: am fc168f84: resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev X-Git-Tag: android-x86-7.1-r1~608^2~19^2~197^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=18d9bd19a4fd75fc7951b43ba01167838f8bb2ac;p=android-x86%2Fbuild.git am 4fc14679: am fc168f84: resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev * commit '4fc1467949aaf9e6a49a6771ed996e3c2c702314': Don't fail build of otatools if there are no device certificates --- 18d9bd19a4fd75fc7951b43ba01167838f8bb2ac