tree 820b9533340a88228767472f6eed1db64699d835
parent 6641c959fbb14cda02169a55bd68851766b0bf0a
parent ee96bde5750e9ebabc6b68444e78a3a947043fb8
author Philip P. Moltmann <moltmann@google.com> 1535491358 -0700
committer android-build-merger <android-build-merger@google.com> 1535491358 -0700

[automerger skipped] Merge "Allow ignoring return values when checking if class is mockable" am: e91c337d41 am: a8e1da9165
am: ee96bde575  -s ours

Change-Id: Ib2fb108b638b62fe857f5f930ef3662d862ddd02