tree e50bc3f5b9f658259bb0af91d79475b5cb0938cf
parent cea440c2ebb8982158adc8bebf3a4cd85a5950fd
parent 275af3429f3049378862883dc6a0db2701f9311f
author Baligh Uddin <baligh@google.com> 1463789077 +0000
committer android-build-merger <android-build-merger@google.com> 1463789077 +0000

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

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

Change-Id: I7e26f26d773c1dac31b274b6c7e708aee1537be8