tree e5d8f4eff9865b78f9818ca43b823e25aa7eb056
parent 8cb769f8fa9347c83c30c896c8d9084bd6bac756
parent a2c7129dbbebda6ccb6b610947fe081a8367ac98
author Colin Cross <ccross@android.com> 1484929725 +0000
committer android-build-merger <android-build-merger@google.com> 1484929725 +0000

Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for jsr305-hostdex" am: 092d0433b4
am: a2c7129dbb

Change-Id: I517c67deb0ff958dc6f085efb8e0aeca06f6b296