OSDN Git Service

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

Change-Id: Ic6b1fbdc277ea4776e75d2de83152c57161278bb


Trivial merge