tree 8a4bda10916ab95210c6938d4b69f9bd4038b000
parent ab58b3894211e0ffaafbadcb70ca9d67c6a7fb5d
parent 74002f39770f13b578770be6cc3cc978dcac671a
author bengt <bengt@google.com> 1440672732 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672732 +0000

am 74002f39: (-s ours) am 2f9a77c9: Merge "Migrated from Robolectric 2.2 to 3.0"

* commit '74002f39770f13b578770be6cc3cc978dcac671a':