tree 5b202bc2928a1cc549ebd4bc5b61a33919cd1847
parent ca3d1f0cf0c80f18cfd6d0bfeddd95347c6da89d
parent b5a80794bbcfd6e9f84dc69113c583ee8bdfeb45
author Tobias Thierer <tobiast@google.com> 1508039687 +0000
committer android-build-merger <android-build-merger@google.com> 1508039687 +0000

Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am: 26817938f6 am: e69366ff27 am: 8e60defe4b
am: b5a80794bb

Change-Id: I4508affe416099033cc497db5fb1894e48a9726e