OSDN Git Service

Merge "Support Mockito in art buildbot tests" am: 1f69674a36
authorTobias Thierer <tobiast@google.com>
Mon, 8 Aug 2016 14:45:16 +0000 (14:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Aug 2016 14:45:16 +0000 (14:45 +0000)
am: 2273f2aaa8

Change-Id: I5e6da5f5e7e50383091686be2f03a5d374291f9a


Trivial merge