tree e56d471de89c24df292add0ec4dec9100686fc07
parent 0fb956843a28b66b5d4b0eab4d460b0cc4a0c122
parent 830d4aaa0c9fb4b5f735e50f81443283062466e3
author Christopher Wiley <wiley@google.com> 1440652342 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652342 +0000

am 830d4aaa: (-s ours) am 9f4f202c: am 7c900060: Merge "Export gmock headers"

* commit '830d4aaa0c9fb4b5f735e50f81443283062466e3':