OSDN Git Service

Merge commit \'8c0c5e61498783496eec848da4f2aa4e30fe98b6\' into mnc-dr-dev
authorBaligh Uddin <baligh@google.com>
Sat, 21 May 2016 00:04:37 +0000 (00:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 21 May 2016 00:04:37 +0000 (00:04 +0000)
am: 275af3429f

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

Change-Id: I7e26f26d773c1dac31b274b6c7e708aee1537be8

1  2 
core/Makefile

diff --cc core/Makefile
Simple merge