diff options
| author | Raluca Sauciuc <ralucas@google.com> | 2014-10-07 00:55:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 00:55:52 +0000 |
| commit | b81889f54ec297aba82ac8110c9983966d2bf9a6 (patch) | |
| tree | 640a5e4cc060535dee9f00e49d80a0e5b07a7a97 /samples/training/network-usage | |
| parent | 7f1146084b6caa3fa73a08968214868682e7833c (diff) | |
| parent | 59f7c4c749fb69c9f83a3d28784147a941fecc58 (diff) | |
| download | frameworks_base-b81889f54ec297aba82ac8110c9983966d2bf9a6.zip frameworks_base-b81889f54ec297aba82ac8110c9983966d2bf9a6.tar.gz frameworks_base-b81889f54ec297aba82ac8110c9983966d2bf9a6.tar.bz2 | |
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.
Diffstat (limited to 'samples/training/network-usage')
0 files changed, 0 insertions, 0 deletions