tree 9160a56f4005b21303fcc85dbc8ecdc6566a5e3c
parent 7fb9a4d538b3691328f2f703a0bacbe2fd1f70bb
parent bfc9e71e0d851204d9f0f380b7f2def51875b657
author Dan Willemsen <dwillemsen@google.com> 1508308424 +0000
committer android-build-merger <android-build-merger@google.com> 1508308424 +0000

Merge "Use soong_ui directly, instead of make" am: e994b4b584 am: 0531e5c647 am: 98fc198f1f
am: bfc9e71e0d

Change-Id: I5ef2f58b01632438702ac3bebb19b61000016dfe