tree 1d9008a885922d17215955146345c2c5d256f050
parent da6dc2f68ad8b8e94d666d87b30b1ddda0c4f43c
parent 2bb56c696bd04836338bb0bea962ff30d46959b0
author Colin Cross <ccross@android.com> 1484929718 +0000
committer android-build-merger <android-build-merger@google.com> 1484929718 +0000

Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for guava-hostdex" am: ebb96ab162
am: 2bb56c696b

Change-Id: Iba9110f7b945278248320f17f9b5facc34aad0ee