OSDN Git Service

Merge commit \'9b4daacaf8f7ce5a534fae524507e4a4f7622ce4\' into nyc-dev
authorBaligh Uddin <baligh@google.com>
Sat, 21 May 2016 00:31:19 +0000 (00:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 21 May 2016 00:31:19 +0000 (00:31 +0000)
am: 0418406186

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

Change-Id: I11ac21e62912328ec5bb19cb4b341c5b8e331ba1

1  2 
core/Makefile

diff --cc core/Makefile
Simple merge