| commit | da4597769b5be791c3588581947650a013115877 | [log] [tgz] |
|---|---|---|
| author | Paul Duffin <paulduffin@google.com> | Wed Feb 22 15:27:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 22 15:27:51 2017 +0000 |
| tree | fb3d579a7d0e8dcce59c6d1efe70c16be3f08f04 | |
| parent | e13bfbde1a1baae986ec33586f0fb1221eec5d64 [diff] | |
| parent | 9b5522f8c4ab1c503d47e0305a5c6b4db45b9828 [diff] |
Merge "Remove conflicting package information for junit.runner and junit.textui" am: f3f4775a35 am: 9b5522f8c4 Change-Id: I4925285c1ea3027d46ac396b8ea29ac44c075e0d