OSDN Git Service

Merge "Testables lib should not statically link mockito" am: 47d04fc5c0
authorPhilip P. Moltmann <moltmann@google.com>
Thu, 21 Dec 2017 19:28:17 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Dec 2017 19:28:17 +0000 (19:28 +0000)
commit0a6f66e9a9728aaa0766cdea15ce59793bdaf259
treec0ebc5af45c5e0fcd5b11977005ac7f0a51d0ea7
parentc65e740f989c6fb811b53d60f9466cd9028d3ce3
parentb42cd23425f9078089734ca5472415f914d2ae23
Merge "Testables lib should not statically link mockito" am: 47d04fc5c0
am: b42cd23425

Change-Id: I7d7096cf24234925256895c3527f44e72cf07493