OSDN Git Service

Merge "Testables lib should not statically link mockito" am: 47d04fc5c0 am: b42cd23425
authorPhilip P. Moltmann <moltmann@google.com>
Thu, 21 Dec 2017 19:59:29 +0000 (19:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Dec 2017 19:59:29 +0000 (19:59 +0000)
commit255108df3d5aeb7beae7613bfa7ad20880870f67
tree4c4b1c2b592e95558e41973c6f8c93c0e6ae55b2
parentc6cd39a58ef43b8a78a3eb5fc114e21bd273371a
parent0a6f66e9a9728aaa0766cdea15ce59793bdaf259
Merge "Testables lib should not statically link mockito" am: 47d04fc5c0 am: b42cd23425
am: 0a6f66e9a9  -s ours

Change-Id: I86a59fd6006a3ba59b237044c61ab1d5c2a61333