tree 68f7a0920d66e766f410e52f2dd984e7533228d9
parent c358e4589f9d8d3661ada9e2077517f70953c12c
parent 8845f3212e75f89d9e01ecf8ac8c575e0709035b
author Brett Chabot <brettchabot@google.com> 1539961314 -0700
committer android-build-merger <android-build-merger@google.com> 1539961314 -0700

Merge "Fix compatibility with Robolectric."
am: 8845f3212e

Change-Id: I655d3a92182496448ef1a119859b213dfa940eec