| commit | f35c305f45db60394c3c7fec2e41b38963da70ca | [log] [tgz] |
|---|---|---|
| author | Raluca Sauciuc <ralucas@google.com> | Mon Oct 06 23:52:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 23:52:19 2014 +0000 |
| tree | 50592195d6ea25a90bc7984eec248ccb0d5aa7a4 | |
| parent | 69c489ed6f28cb3c79f13b2f7b6cffc6d3b49627 [diff] | |
| parent | 6a3faf5a8b182d20dea47fb76cf33456321ddf7a [diff] |
am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev * commit '6a3faf5a8b182d20dea47fb76cf33456321ddf7a': Fix test framework to allow Mockito tests to run successfully on ART.