| commit | b81889f54ec297aba82ac8110c9983966d2bf9a6 | [log] [tgz] |
|---|---|---|
| author | Raluca Sauciuc <ralucas@google.com> | Tue Oct 07 00:55:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 00:55:52 2014 +0000 |
| tree | 640a5e4cc060535dee9f00e49d80a0e5b07a7a97 | |
| parent | 7f1146084b6caa3fa73a08968214868682e7833c [diff] | |
| parent | 59f7c4c749fb69c9f83a3d28784147a941fecc58 [diff] |
am 59f7c4c7: am 1cb156bb: am f35c305f: am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev * commit '59f7c4c749fb69c9f83a3d28784147a941fecc58': Fix test framework to allow Mockito tests to run successfully on ART.