| commit | 5405d94a47f7f48ef43aeca0e3b5e7ca56ac6b39 | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Tue Jun 17 17:39:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 17 17:39:25 2014 +0000 |
| tree | e7804ceb5b281e95ecd02d060ade455d0438ac24 | |
| parent | cd4e61bafcb01f4bb70b5209f5994b6fffda6640 [diff] | |
| parent | 0e4895c43d8a194a664b25d52abf6842e9c7335e [diff] |
am 0e4895c4: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner" into stage-aosp-master * commit '0e4895c43d8a194a664b25d52abf6842e9c7335e': DO NOT MERGE: fix package for AndroidJUnitRunner