| commit | 3fab7a03e785ad450ce30fe67800d4e7abd1f783 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Thu Dec 08 12:37:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 08 12:37:47 2016 +0000 |
| tree | bef2d827bf959fdb3829fde48c9c522cec8bbdec | |
| parent | 11fcfa53f7f9190750b38966f2de26822bf5dc74 [diff] | |
| parent | 8ff805e22a3df14cc4a6283ebc1cdaeb6ff7aa4d [diff] |
Merge "junit doesn't need the framework." am: 076c475e79 am: 8ff805e22a Change-Id: I95bc88eb5ae20e2ea26da91c4fa459b9ed28eeeb