From: Colin Cross <ccross@android.com>
Date: Tue, 12 Jul 2016 16:23:10 +0000 (+0000)
Subject: Merge \\"Remove Android.bp logic from makefiles\\" am: 8bc18d35ec
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=95ebfddd5f477645b7df611b11e47b814f44079a;p=android-x86%2Fbuild.git

Merge \\"Remove Android.bp logic from makefiles\\" am: 8bc18d35ec
am: 7dc26e8aa8

Change-Id: Iad45e3fd9b172c94df46d20425e51ae7477b5a2d
---

95ebfddd5f477645b7df611b11e47b814f44079a