OSDN Git Service

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

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

Change-Id: Ibc2622b8292cb33270fe89ee8fcae4cdeb6b60c9
core/definitions.mk