tree 2e9b45b776630be773ca32da0997ea27d787653b
parent 9e6e31e52aa9cb4ccd2f6fa5e50cc8a1725d9592
parent 83b9cd93361f0d6d39e04cd3c1ba1475edbac673
author Colin Cross <ccross@android.com> 1484930240 +0000
committer android-build-merger <android-build-merger@google.com> 1484930240 +0000

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

Change-Id: I70e474d9a96a7ac0a8d0d7e221b60c003414d624