tree b13d44029966f7e5e80c8fb822144b5d91ff70cb
parent 6685bcf54cc700965303a08a06ba993a4472c053
parent 0418406186f67096a3c42fa276799095620e2296
author Baligh Uddin <baligh@google.com> 1463790679 +0000
committer android-build-merger <android-build-merger@google.com> 1463790679 +0000

Merge commit \'9b4daacaf8f7ce5a534fae524507e4a4f7622ce4\' into nyc-dev
am: 0418406186

* commit '0418406186f67096a3c42fa276799095620e2296':
  Add Oem Props to otatools package

Change-Id: I11ac21e62912328ec5bb19cb4b341c5b8e331ba1