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