| commit | e4e5195e59f10a88f20a3287863eaf415a575d79 | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Mon Apr 07 22:57:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 07 22:57:20 2014 +0000 |
| tree | 6cd60650c590891a9a9b62f316b61f5ee4d83a61 | |
| parent | b3059f8744f50e451bb866a9ed2f247ae61e27e4 [diff] | |
| parent | f457a8630fb678ae60c4970995499c57fc74a12c [diff] |
am f457a863: (-s ours) am 1601b1c9: (-s ours) am 6c56e9e1: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner" * commit 'f457a8630fb678ae60c4970995499c57fc74a12c': DO NOT MERGE: fix package for AndroidJUnitRunner