tree bd7933ed033f464753db12bd2030b5bd6f4b0d21
parent 2d3db98b72383491a1bf57686e633265ca52be28
parent 9ca7c9294663d035d3e903e74f81ffdfb7127d3e
author Philip P. Moltmann <moltmann@google.com> 1513338921 +0000
committer android-build-merger <android-build-merger@google.com> 1513338921 +0000

Merge changes from topic "BackportMockito212" am: deea179464 am: 7c9d4f5a11
am: 9ca7c92946

Change-Id: I2aeaff1997a7ac9ad2a632d4212eb5ba9c822263