| commit | 15bbdce417930becc8f2d224051c54421ada0755 | [log] [tgz] |
|---|---|---|
| author | Brett Chabot <brettchabot@google.com> | Fri Oct 19 08:06:28 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 19 08:06:28 2018 -0700 |
| tree | 68f7a0920d66e766f410e52f2dd984e7533228d9 | |
| parent | cf68d9fb3a64b22afe5c9a002a9616ddd678bb3a [diff] | |
| parent | 5255f14314b155142f2d8634dc59a0687c400a62 [diff] |
Merge "Fix compatibility with Robolectric." am: 8845f3212e am: 5255f14314 Change-Id: I696126dcfb4a9d0315c70f8f5dc3f1a1bbb7d66e