tree ea8a38a3f72cfba7f73fb413501dc9878644b578
parent c06766d36dee8c9f2e587d0a7055e50b1f9d3b3b
parent 3c3d6f7ecbc8568cb287bff0d1c8a2daa7a44093
author Orion Hodson <oth@google.com> 1509373563 +0000
committer android-build-merger <android-build-merger@google.com> 1509373563 +0000

Merge "DexMerger: Workaround for buffer overflow in tests" am: f823242464
am: 3c3d6f7ecb

Change-Id: I54e43cc6460835d4267eced627f88856cd41f42d