commit | 6db2a96c038cda8d3e203aac744ae4d8f44b5984 | [log] [tgz] |
---|---|---|
author | Aurimas Liutikas <aurimas@google.com> | Mon Nov 21 17:53:34 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 21 17:53:34 2016 +0000 |
tree | 6b0c7b74f9b7e75a464e263f6e785938f4b8f289 | |
parent | 76179cb42803d31fe9afc8b7f0559827867b1470 [diff] | |
parent | 7a00bf40dc859ba5764238829eac11b6d51895f8 [diff] |
Merge "Reland allowing MockitoAnnotations.* as static import." am: 7a00bf40dc Change-Id: I7596362feebd22a724449bd98ccc34f3dbfaf629