tree 09e4f0943e94547981dd55aa91b711180b3e68f4
parent b6303a1949eddafbde5b0aea6297bcbec2ed596a
parent 1f69674a36616e53491aa50e8dc910346c877832
author Tobias Thierer <tobiast@google.com> 1470667308 +0000
committer android-build-merger <android-build-merger@google.com> 1470667308 +0000

Merge "Support Mockito in art buildbot tests"
am: 1f69674a36

Change-Id: If950283797508087df7306e0f6b87bf4d32c90a4