tree 3b330660c4c070894a20827de5c8cd817284b309
parent 7dcc0280552bfaa6d700fb61b91e7c3e2c41a34d
parent a192c7370ceda0de72bad1ed96e515d9c46636e0
author Colin Cross <ccross@android.com> 1534481537 -0700
committer android-build-merger <android-build-merger@google.com> 1534481537 -0700

Merge changes from topic "java_test_junit"
am: a192c7370c

Change-Id: I5d0b031e9daded8c973cc7b65c5c44330fe1c293