OSDN Git Service

Merge "Read Soong-exported configuration" am: c7b610a67e
authorDan Willemsen <dwillemsen@google.com>
Fri, 13 May 2016 01:43:09 +0000 (01:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 May 2016 01:43:09 +0000 (01:43 +0000)
commit2697421213c42e791affe2f2784774c2c4c09dc2
tree53e1feda194199c4ee0309e60132597fa977a8dd
parent277e827ab61e211d255d9e6041d33aade561d156
parentbcbba61a2500da9c51690ef8956e15020e9f6fea
Merge "Read Soong-exported configuration" am: c7b610a67e
am: bcbba61a25

* commit 'bcbba61a2500da9c51690ef8956e15020e9f6fea':
  Read Soong-exported configuration

Change-Id: Ia23208e26bae53bd74bb77b0a0ebbe63ac6f8a9c
core/main.mk
core/ninja.mk