OSDN Git Service

Merge "Soong: Read Android.soong.mk if skipping Android.mk"
authorDan Willemsen <dwillemsen@google.com>
Fri, 13 May 2016 23:56:11 +0000 (23:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 May 2016 23:56:11 +0000 (23:56 +0000)
am: ea71c96894

* commit 'ea71c968943209f41191a1f164f899dd002b9119':
  Soong: Read Android.soong.mk if skipping Android.mk

Change-Id: I76aa5c350a26ea718df36f1df4ba5ade3f49a478


Trivial merge