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