tree 82153599744d02d6c6812b01b522d6da2db0b9c3
parent cd75edb817892de713f433b35527a5e2d193bb49
parent fa5b2040297119265bbb34cc25c79098c431ec08
author Dan Willemsen <dwillemsen@google.com> 1539738086 -0700
committer android-build-merger <android-build-merger@google.com> 1539738086 -0700

Merge "Stop using DIST_DIR directly, use dist-for-goals instead" am: a8f2601d28 am: 9b767e275e
am: fa5b204029

Change-Id: Ic052f5d1de317c2f271f5a2df83c733c79978679