| commit | 255108df3d5aeb7beae7613bfa7ad20880870f67 | [log] [tgz] |
|---|---|---|
| author | Philip P. Moltmann <moltmann@google.com> | Thu Dec 21 19:59:29 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 21 19:59:29 2017 +0000 |
| tree | 4c4b1c2b592e95558e41973c6f8c93c0e6ae55b2 | |
| parent | c6cd39a58ef43b8a78a3eb5fc114e21bd273371a [diff] | |
| parent | 0a6f66e9a9728aaa0766cdea15ce59793bdaf259 [diff] |
Merge "Testables lib should not statically link mockito" am: 47d04fc5c0 am: b42cd23425 am: 0a6f66e9a9 -s ours Change-Id: I86a59fd6006a3ba59b237044c61ab1d5c2a61333