OSDN Git Service

Merge "Move the Robolectric shadow config up." into oc-mr1-dev
authorDaniel Nishi <dhnishi@google.com>
Thu, 24 Aug 2017 21:24:31 +0000 (21:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 21:24:31 +0000 (21:24 +0000)
commit5f97c05f1c4f55fc23f6bad8a30ba4a25713122b
treef8f0790a539f5000881c0018f67a980b15a45c92
parenta9eb0eb4bc5735e0d841798de64b75e7273cc12d
parentefcc8be05c919ca0ac2b6cfb7810c7b722a0f66f
Merge "Move the Robolectric shadow config up." into oc-mr1-dev
am: efcc8be05c

Change-Id: Ie816d276fe196452f38c88ca1f944dd040f19321