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)
commitb8759f4f4b060fe9c4dc60fa6d786949b81f4ca0
tree0c684d9da37b879053b7c64b6b97b9d21a0085a8
parentc33da56ff30e89f5b09ec02d0b50815b27ab833e
parentea71c968943209f41191a1f164f899dd002b9119
Merge "Soong: Read Android.soong.mk if skipping Android.mk"
am: ea71c96894

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

Change-Id: I76aa5c350a26ea718df36f1df4ba5ade3f49a478