tree b68d65204d3a386b14bfd16cf12f3213d13033d1
parent c891e46a5e08e0888aa4bf6489b7c7f585275f2d
parent 9a76153826e8f0092db017dc089802f5d67df60a
author Paul Duffin <paulduffin@google.com> 1489748884 +0000
committer android-build-merger <android-build-merger@google.com> 1489748884 +0000

Merge changes from topic 'upgrade-mockito-2.7.13' am: 55c52fc184
am: 9a76153826

Change-Id: I32c32b34cdbd26aaf651cefebaccc7b28be34740