tree 2e9b45b776630be773ca32da0997ea27d787653b
parent 5711c1a80f26a8e8935a318f9f9d44d9536a6c81
parent 2933ae212833b2702867f044f87f602f4071531f
author Colin Cross <ccross@android.com> 1484929729 +0000
committer android-build-merger <android-build-merger@google.com> 1484929729 +0000

Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex" am: 9dd4dbb077
am: 2933ae2128

Change-Id: I6469d292950d2439f71e0d9128b7591f5b5b7151