| commit | ee7e2ce57021d57dde6887a751bf3dc3f2ab03eb | [log] [tgz] |
|---|---|---|
| author | bengt <bengt@google.com> | Thu Aug 27 14:46:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:46:19 2015 +0000 |
| tree | 8126c598d92ebaee50ab16351c56997e0b483bbe | |
| parent | d9058fd04a66555bce38f9ffc6dae68c45c0aecf [diff] | |
| parent | 8d7173d3551adde60094b7503e739ecae30e224f [diff] |
am 8d7173d3: am 74002f39: (-s ours) am 2f9a77c9: Merge "Migrated from Robolectric 2.2 to 3.0" * commit '8d7173d3551adde60094b7503e739ecae30e224f':