From: bowgotsai <bowgotsai@google.com>
Date: Wed, 7 Dec 2016 03:30:30 +0000 (+0000)
Subject: Merge "custom_image: fix build break" am: 52897d4ecb
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=882fc2c96a634296727f637efad078da69be0b22;p=android-x86%2Fbuild.git

Merge "custom_image: fix build break" am: 52897d4ecb
am: ab0ae8e728

Change-Id: I20aa30f30bafcfb49b39c0d69b87ed5e7e4ecae5
---

882fc2c96a634296727f637efad078da69be0b22