commit | 74002f39770f13b578770be6cc3cc978dcac671a | [log] [tgz] |
---|---|---|
author | bengt <bengt@google.com> | Mon Aug 24 18:34:53 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 18:34:53 2015 +0000 |
tree | 8a4bda10916ab95210c6938d4b69f9bd4038b000 | |
parent | 8cb9c581740c2a79e99c1753fb71d05124eb8a9f [diff] | |
parent | 2f9a77c9ec313fd09eb831c606069f748213f67c [diff] |
am 2f9a77c9: Merge "Migrated from Robolectric 2.2 to 3.0" * commit '2f9a77c9ec313fd09eb831c606069f748213f67c': Migrated from Robolectric 2.2 to 3.0