| commit | 9cb5f2815dae97560ab10ad19da65db5d35cc237 | [log] [tgz] |
|---|---|---|
| author | Paul Duffin <paulduffin@google.com> | Wed Dec 07 13:08:36 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 07 13:08:36 2016 +0000 |
| tree | 879a61dbdeafa424b3c59e430fa801aee43f2d56 | |
| parent | 754950497050d20ede4ebd30fd99dfda95721349 [diff] | |
| parent | a4d7100a3b20080d1a5bcf46d3f70ad419d521a1 [diff] |
Merge "Replace core-junit with junit" am: 6ac5293751 am: a4d7100a3b Change-Id: If81ca0656d26e2b0e05913c491615f769cb63b55