| commit | 524fa40b24d91abfe56b099d1cf11e8de49acfac | [log] [tgz] |
|---|---|---|
| author | bengt <bengt@google.com> | Mon Aug 24 23:39:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 23:39:02 2015 +0000 |
| tree | 8126c598d92ebaee50ab16351c56997e0b483bbe | |
| parent | 346f4c1cf440c635cf1d4df02ae57e4f12b58492 [diff] | |
| parent | acf866f5b3b92fec5ce40f09b7d2417d1bc150eb [diff] |
am acf866f5: am 2f9a77c9: Merge "Migrated from Robolectric 2.2 to 3.0" * commit 'acf866f5b3b92fec5ce40f09b7d2417d1bc150eb': Migrated from Robolectric 2.2 to 3.0