| commit | 1cb156bb0160a1474b1703893b6e3e96c407cc5a | [log] [tgz] |
|---|---|---|
| author | Raluca Sauciuc <ralucas@google.com> | Tue Oct 07 00:32:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 00:32:10 2014 +0000 |
| tree | c173488eaf6735be483ff771f35e3adcadd382ed | |
| parent | 84527eca759495b4a5514edbea9a56b907992a42 [diff] | |
| parent | f35c305f45db60394c3c7fec2e41b38963da70ca [diff] |
am f35c305f: am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev * commit 'f35c305f45db60394c3c7fec2e41b38963da70ca': Fix test framework to allow Mockito tests to run successfully on ART.