| commit | 4dcd3d104d35f6365442f8f95633d2c81665bf5c | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Thu Aug 27 05:12:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:12:22 2015 +0000 |
| tree | e56d471de89c24df292add0ec4dec9100686fc07 | |
| parent | 0fb956843a28b66b5d4b0eab4d460b0cc4a0c122 [diff] | |
| parent | 830d4aaa0c9fb4b5f735e50f81443283062466e3 [diff] |
am 830d4aaa: (-s ours) am 9f4f202c: am 7c900060: Merge "Export gmock headers" * commit '830d4aaa0c9fb4b5f735e50f81443283062466e3':