tree 8a4bda10916ab95210c6938d4b69f9bd4038b000
parent 2068778aef79c74b9c2cc92b29de6b0e7ff2688d
parent 2f9a77c9ec313fd09eb831c606069f748213f67c
author bengt <bengt@google.com> 1440441301 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440441301 +0000

am 2f9a77c9: Merge "Migrated from Robolectric 2.2 to 3.0"

* commit '2f9a77c9ec313fd09eb831c606069f748213f67c':
  Migrated from Robolectric 2.2 to 3.0