tree b0dc4be3e6bee5deb6e9ad4fc849f70f35b545c7
parent a7c8f5a4e0dd714cc936dae246daa7b495918226
parent 6c2f92bab6b40dc535ad0d271b1810f46d92ec01
author Colin Cross <ccross@android.com> 1523401739 -0700
committer android-build-merger <android-build-merger@google.com> 1523401739 -0700

Merge "Add java_test and java_test_host" am: 47f98af97f
am: 6c2f92bab6

Change-Id: Id284ec9287b264c37ffbf5346900a22693dd57d5