tree 4202fb0d6ead624b59da4e4dec279db209f71983
parent 072cfe202e5de615c427fdb59d7d20b1de0a567c
parent 592cfc18595998e99bf5ec12d2105618aaad9751
author Dan Willemsen <dwillemsen@google.com> 1470944410 +0000
committer android-build-merger <android-build-merger@google.com> 1470944410 +0000

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

Change-Id: Id9a60ebbd282026ab7a0ff5bc85757a5c545ffb7