| commit | 9ca82ecf261c09596920051ac79f2e6cebb9b918 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Mon Nov 21 18:03:36 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 21 18:03:36 2016 +0000 |
| tree | d466fa7a5d68bd449931728d4467ad03974d39f8 | |
| parent | 991b6df55080a3d9b5986c62dfa7d838b06acefc [diff] | |
| parent | 778e216faff55c4a0f2167776c98902b67793384 [diff] |
Merge "Reland allowing MockitoAnnotations.* as static import." am: 7a00bf40dc am: 6db2a96c03 am: 778e216faf Change-Id: Idf045c0e234d14a3ba402bd10e0542fcb94ab90d