tree e56d471de89c24df292add0ec4dec9100686fc07
parent 573eb2a7523a8b09bdd1c3063e133643b157a673
parent 1e6be7df74bc39d489390be3a51d3611815862d7
author Tamas Berghammer <tberghammer@google.com> 1440652341 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652341 +0000

am 1e6be7df: (-s ours) am e36200f7: am 370e17e7: Merge "Initial drop of gmock 1.7.0"

* commit '1e6be7df74bc39d489390be3a51d3611815862d7':