OSDN Git Service

Merge "Don't include mockito in frameworks-base-testutils"
authorPhilip P. Moltmann <moltmann@google.com>
Wed, 20 Dec 2017 19:09:03 +0000 (19:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Dec 2017 19:09:03 +0000 (19:09 +0000)
commitcf7aa7c09eb438a9f2dd47e9a0348c39217d4ea7
tree401a56a84ac5f365242998d17ab024d32c77b2a0
parent5949912523e76680a61f3c511c4a3fda3b2131c8
parentf924642729a43ff508f084b6a1e5471fc017400e
Merge "Don't include mockito in frameworks-base-testutils"
am: f924642729

Change-Id: I4470f63baac7bc33dff0dac94da3a0d93c322dc7