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