| commit | 6d9cbb5b6a72af5ebb6422c0b70637898a27987f | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Thu Dec 08 12:47:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 08 12:47:18 2016 +0000 |
| tree | bef2d827bf959fdb3829fde48c9c522cec8bbdec | |
| parent | 95c619b140d082f929f39b424d0d94772bee3efc [diff] | |
| parent | cae0ec0b611e7263c0a3dcb1ff5f62a1cf7756d0 [diff] |
Merge "junit doesn't need the framework." am: 076c475e79 am: 8ff805e22a am: 3fab7a03e7 am: cae0ec0b61 Change-Id: I177d5153f8834abdc204743a44e4336e5d8ac6a9