| commit | 8d7173d3551adde60094b7503e739ecae30e224f | [log] [tgz] |
|---|---|---|
| author | bengt <bengt@google.com> | Thu Aug 27 10:52:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:52:12 2015 +0000 |
| tree | 8a4bda10916ab95210c6938d4b69f9bd4038b000 | |
| parent | ab58b3894211e0ffaafbadcb70ca9d67c6a7fb5d [diff] | |
| parent | 74002f39770f13b578770be6cc3cc978dcac671a [diff] |
am 74002f39: (-s ours) am 2f9a77c9: Merge "Migrated from Robolectric 2.2 to 3.0" * commit '74002f39770f13b578770be6cc3cc978dcac671a':