| commit | 1e6be7df74bc39d489390be3a51d3611815862d7 | [log] [tgz] |
|---|---|---|
| author | Tamas Berghammer <tberghammer@google.com> | Sun Jul 05 11:20:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 05 11:20:43 2015 +0000 |
| tree | cd4c31a386b355c3351fc6a9b6bc68d1c14c0e89 | |
| parent | d0f8ff8ba5cb9f617b156da9aa699681750284e8 [diff] | |
| parent | e36200f72b985be04a416aa97c88216af920422c [diff] |
am e36200f7: am 370e17e7: Merge "Initial drop of gmock 1.7.0" * commit 'e36200f72b985be04a416aa97c88216af920422c':