OSDN Git Service

Merge "Update combined build.ninja to depend on Soong's build.ninja"
authorDan Willemsen <dwillemsen@google.com>
Thu, 3 Nov 2016 02:45:12 +0000 (02:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Nov 2016 02:45:12 +0000 (02:45 +0000)
am: 77ecb3347b

Change-Id: Ia9520db5e535a290d713ce87e3dcba73be7327d7


Trivial merge