tree 7f03f4c8e9754fc494ab3734f3c7151c892925bf
parent 56745f6c7b460f16acdaaed33c67bf27b15d1698
parent 96963dfd4db8fa505fa9a318ff4543b1f526215d
author Dan Willemsen <dwillemsen@google.com> 1470944204 +0000
committer android-build-merger <android-build-merger@google.com> 1470944204 +0000

Merge "Use soong_zip and zip2zip to make dist faster" am: 6dcdb45485
am: 96963dfd4d

Change-Id: I0f19fc1908f84da6f602564d57256423b108bf16