tree 8126c598d92ebaee50ab16351c56997e0b483bbe
parent 346f4c1cf440c635cf1d4df02ae57e4f12b58492
parent acf866f5b3b92fec5ce40f09b7d2417d1bc150eb
author bengt <bengt@google.com> 1440459542 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440459542 +0000

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

* commit 'acf866f5b3b92fec5ce40f09b7d2417d1bc150eb':
  Migrated from Robolectric 2.2 to 3.0