tree adc3b05c27f67f551dc33991e67dfdf653822355
parent 5fa44dfb043c7375efca74cbb50c19f1c5eec8ae
parent 5346d0710826d56bb66c84e39723c9085a8ae337
author Colin Cross <ccross@android.com> 1556815798 -0700
committer android-build-merger <android-build-merger@google.com> 1556815798 -0700

Merge "Support robolectric_test"
am: 5346d07108

Change-Id: I3cfaed80b45ef76d0be1769e35ea379896fcbcbd