tree 5ec19441707b3bd7f34f41be93029a50f6c88b0b
parent 81aaf87d097aae2f0a5f8bd7286f82a4d0658b77
parent 3671b1e910e4d297bebcd3ceaa2682bfb4b1f4a1
author Jeff Sharkey <jsharkey@android.com> 1361316586 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1361316589 +0000

Merge "Migrate to using Mockito directly."