OSDN Git Service

Merge "Walk up tree to find makefiles in mma"
authorColin Cross <ccross@android.com>
Thu, 1 Sep 2016 23:42:34 +0000 (23:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Sep 2016 23:42:34 +0000 (23:42 +0000)
am: 5ccafd0f29

Change-Id: Ia43e06a1f7169f9ed709fbbb3ef7763b9155daf2


Trivial merge