tree e56d471de89c24df292add0ec4dec9100686fc07
parent 4dcd3d104d35f6365442f8f95633d2c81665bf5c
parent 0797b0e5d5d352ebe2bef6147bdf3e20c99f770c
author Gilad Arnold <garnold@google.com> 1440652343 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652343 +0000

am 0797b0e5: (-s ours) am 92f488a5: am b4a61987: Merge "Add RTTI support to libgmock and libgmock_host."

* commit '0797b0e5d5d352ebe2bef6147bdf3e20c99f770c':