| commit | 778e216faff55c4a0f2167776c98902b67793384 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Mon Nov 21 17:59:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 21 17:59:04 2016 +0000 |
| tree | 6ed1854c281d02e6bebc2932cc3840d28813b67a | |
| parent | fb31ee8fef14f741f5f650228053a86fe93fcb9e [diff] | |
| parent | 6db2a96c038cda8d3e203aac744ae4d8f44b5984 [diff] |
Merge "Reland allowing MockitoAnnotations.* as static import." am: 7a00bf40dc am: 6db2a96c03 Change-Id: I23c40d509dd884003da989d572b8c6df928ba559