commit | 478eb7769b18b78d385f6c941d8b3b7416b6fe07 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Tue Feb 19 15:33:00 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 19 15:33:00 2013 -0800 |
tree | c36f7744fb5b6f77f666b40a8926179500e8da2d | |
parent | 2c87523084388ee95f49f9cde1f0ad1d2fec82bb [diff] | |
parent | 22cb5b37a572270788f00881727f483da373ec05 [diff] |
am 22cb5b37: Merge "Migrate to using Mockito directly." * commit '22cb5b37a572270788f00881727f483da373ec05': Migrate to using Mockito directly.