From: Colin Cross <ccross@android.com>
Date: Thu, 1 Sep 2016 23:42:34 +0000 (+0000)
Subject: Merge "Walk up tree to find makefiles in mma"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8ff4ea8ada6fd1d995e9a31671632385ec25e3e6;p=android-x86%2Fbuild.git

Merge "Walk up tree to find makefiles in mma"
am: 5ccafd0f29

Change-Id: Ia43e06a1f7169f9ed709fbbb3ef7763b9155daf2
---

8ff4ea8ada6fd1d995e9a31671632385ec25e3e6