tree ebec742dff5c2f0e2d1037c390a1fb8fc4e12d00
parent a0df3496d33ed6ead766d99f68587379856bd8e9
parent e994b4b584a23be4574b725f6b5e654535f8e1d0
author Dan Willemsen <dwillemsen@google.com> 1508307006 +0000
committer android-build-merger <android-build-merger@google.com> 1508307006 +0000

Merge "Use soong_ui directly, instead of make"
am: e994b4b584

Change-Id: I406a02af2d5fd1accf5c53609af00f416669e18f