From: Baligh Uddin <baligh@google.com>
Date: Sat, 21 May 2016 00:04:37 +0000 (+0000)
Subject: Merge commit \'8c0c5e61498783496eec848da4f2aa4e30fe98b6\' into mnc-dr-dev
X-Git-Tag: android-x86-7.1-r1~178^2^2~10^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6c70b85cb3c75650e5154366fb5e08e3aadf9a50;p=android-x86%2Fbuild.git

Merge commit \'8c0c5e61498783496eec848da4f2aa4e30fe98b6\' into mnc-dr-dev
am: 275af3429f

* commit '275af3429f3049378862883dc6a0db2701f9311f':
  Add Oem Props to otatools package

Change-Id: I7e26f26d773c1dac31b274b6c7e708aee1537be8
---

6c70b85cb3c75650e5154366fb5e08e3aadf9a50