tree a47a35bea8164ac21c76c93f2797ad4c87e1514b
parent b0a2d2cdf30fb1d80535c472f97ac20851b83817
parent 90c7467239e87c2e80d04433002a297ae1b1873d
author Mathieu Chartier <mathieuc@google.com> 1515532626 +0000
committer android-build-merger <android-build-merger@google.com> 1515532626 +0000

Merge "Disable compact dex for input fd == output fd" am: 69acdd7512
am: 90c7467239

Change-Id: I6d9d8dcf172e5e9521e097f392a00236b4831c60